update and fix

Plugins/BTCPayServer.Plugins.Bringin/BTCPayServer.Plugins.Bringin.csproj

@@ -9,7 +9,7 @@
     <PropertyGroup>
         <Product>Bringin</Product>
         <Description>Euro Offramp</Description>
-        <Version>1.0.2</Version>
+        <Version>1.0.3</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <!-- Plugin development properties -->

Plugins/BTCPayServer.Plugins.LiquidPlus/BTCPayServer.Plugins.LiquidPlus.csproj

@@ -12,7 +12,7 @@
     <PropertyGroup>
       <Product>Liquid+</Product>
       <Description>Enhanced support for the liquid network.</Description>
-      <Version>1.1.5</Version>
+      <Version>1.1.6</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 

Plugins/BTCPayServer.Plugins.LiquidPlus/LiquidPlusPlugin.cs

@@ -66,8 +66,11 @@ namespace BTCPayServer.Plugins.LiquidPlus
                     .Replace("-", "")
                     .Replace("_", "").ToUpperInvariant();
                 
-                if(code == "LBTC" || code == "USDT" || code == "ETB" || code == "LCAD")
+                if(code == "LBTC" || code == "USDT" || code == "LCAD")
                     return;
+                
+                
+                var pmi2 = PaymentTypes.CHAIN.GetPaymentMethodId(code);
                 services.AddBTCPayNetwork(new ElementsBTCPayNetwork()
                 {
                     CryptoCode = code,
@@ -90,7 +93,8 @@ namespace BTCPayServer.Plugins.LiquidPlus
                     VaultSupported = template.VaultSupported,
                     MaxTrackedConfirmation = template.MaxTrackedConfirmation,
                     SupportRBF = template.SupportRBF
-                }).AddTransactionLinkProvider(code, tlProvider.Provider);
+                });
+                services.AddSingleton(tlProvider with {PaymentMethodId = pmi2});
             });
         }
     }

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/CustomLiquidAssets/Assets.cshtml

@@ -1,13 +1,7 @@
-@inject ContentSecurityPolicies contentSecurityPolicies
 @using BTCPayServer.Security
-@using NBitcoin
 @model BTCPayServer.Plugins.LiquidPlus.Models.CustomLiquidAssetsViewModel
 @{
-    Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["NavPartialName"] = "../UIServer/_Nav";
     ViewData["Title"] = "Custom Liquid Assets";
-    var nonce = RandomUtils.GetUInt256().ToString().Substring(0, 32);
-    contentSecurityPolicies.Add("script-src", $"'nonce-{nonce}'");
 }
 @if (Model.PendingChanges)
 {
@@ -67,7 +61,7 @@
         <button id="import-liquid-asset-from-registry" type="button"  class="btn btn-secondary">Import from Blockstream Asset Registry</button>
         <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
     </div>
-    <script type="text/javascript" nonce="@nonce">
+    <script type="text/javascript">
         document.getElementById("import-liquid-asset-from-registry").addEventListener("click", function (){
             var id = prompt("Enter the asset id");
             if (id){

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/Shared/CustomLiquidAssetsNavExtension.cshtml

@@ -1,7 +1,13 @@
+
+@using BTCPayServer.Client
 @using BTCPayServer.Plugins.LiquidPlus.Controllers
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @{
     var isActive = ViewContext.RouteData.Values.TryGetValue("Controller", out var controller) && controller is not null &&
                    nameof(CustomLiquidAssetsController).StartsWith(controller?.ToString(), StringComparison.InvariantCultureIgnoreCase);
 }
 
+    <li class="nav-item nav-item-sub" permission="@Policies.CanModifyServerSettings">
+
         <a class="nav-link @(isActive ? "active" : string.Empty)"asp-action="Assets" asp-controller="CustomLiquidAssets">Liquid Assets</a>
+    </li>

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/Shared/LiquidNav.cshtml

@@ -1,12 +1,8 @@
-@using BTCPayServer
 @using BTCPayServer.Abstractions.Contracts
 @using BTCPayServer.Client
-@using BTCPayServer.Plugins.Altcoins
 @using BTCPayServer.Plugins.LiquidPlus.Controllers
 @using Microsoft.AspNetCore.Mvc.TagHelpers
-@using Microsoft.AspNetCore.Routing
 
-@inject BTCPayNetworkProvider BTCPayNetworkProvider;
 
 @inject IScopeProvider ScopeProvider
 @{
@@ -14,7 +10,7 @@
     var isActive = !string.IsNullOrEmpty(storeId) && ViewContext.RouteData.Values.TryGetValue("Controller", out var controller) &&  controller is not null && 
                    nameof(StoreLiquidController).StartsWith(controller?.ToString(), StringComparison.InvariantCultureIgnoreCase);
 }
-@if (!string.IsNullOrEmpty(storeId) && (BTCPayNetworkProvider.GetAll().OfType<ElementsBTCPayNetwork>().Any()))
+@if (!string.IsNullOrEmpty(storeId) )
 {
     <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
         <a asp-route-storeId="@storeId" asp-action="GenerateLiquidScript" asp-controller="StoreLiquid" class="nav-link js-scroll-trigger @(isActive ? "active" : string.Empty)">

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/Shared/OnChainWalletSetupLiquidExtension.cshtml

@@ -20,11 +20,11 @@
 
     if (!walletSetupViewModel.Confirmation && walletSetupViewModel.Method == WalletSetupMethod.ImportOptions)
     {
-        <script>
+    @*     <script> *@
-        document.addEventListener('DOMContentLoaded', () => {
+    @*     document.addEventListener('DOMContentLoaded', () => { *@
-            document.querySelectorAll(".list-group-item:not(#ImportSeedLink)").forEach(e => e.parentElement.remove());
+    @*         document.querySelectorAll(".list-group-item:not(#ImportSeedLink)").forEach(e => e.parentElement.remove()); *@
-        });
+    @*     }); *@
-    </script>
+    @* </script> *@
     }
     if (!walletSetupViewModel.Confirmation && walletSetupViewModel.Method is WalletSetupMethod.HotWallet or WalletSetupMethod.Seed)
     {

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/Shared/StoreNavLiquidExtension.cshtml

@@ -1,17 +1,13 @@
-@using BTCPayServer
+
 @using BTCPayServer.Abstractions.Contracts
-@using BTCPayServer.Plugins.Altcoins
 @using BTCPayServer.Plugins.LiquidPlus.Controllers
 @using Microsoft.AspNetCore.Mvc.TagHelpers
-@using Microsoft.AspNetCore.Routing
-@inject BTCPayNetworkProvider BTCPayNetworkProvider;
 @inject IScopeProvider ScopeProvider
 @{
     var storeId = ScopeProvider.GetCurrentStoreId();
     var isActive = !string.IsNullOrEmpty(storeId) && ViewContext.RouteData.Values.TryGetValue("Controller", out var controller) &&  controller is not null && 
  nameof(StoreLiquidController).StartsWith(controller?.ToString(), StringComparison.InvariantCultureIgnoreCase);
 }
-@if (BTCPayNetworkProvider.GetAll().OfType<ElementsBTCPayNetwork>().Any())
+
-{
     <a class="nav-link @(isActive ? "active" : string.Empty)" asp-route-storeId="@storeId" asp-action="GenerateLiquidScript" asp-controller="StoreLiquid">Liquid</a>
-}
+

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/StoreLiquid/GenerateLiquidScript.cshtml

@@ -1,8 +1,6 @@
 
 @model BTCPayServer.Plugins.LiquidPlus.Controllers.StoreLiquidController.GenerateLiquidImportScripts
 @{
-    Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["NavPartialName"] = "../UIStores/_Nav";
     ViewBag.MainTitle = "Store settings";
     ViewData["title"] = "Liquid Import";
 }

Plugins/BTCPayServer.Plugins.LiquidPlus/Views/_ViewImports.cshtml

@@ -1,2 +1,5 @@
-@addTagHelper *, BTCPayServer.Abstractions
+@using BTCPayServer.Abstractions.Services
+@inject Safe Safe
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, BTCPayServer
+@addTagHelper *, BTCPayServer.Abstractions

Plugins/BTCPayServer.Plugins.Prism/BTCPayServer.Plugins.Prism.csproj

@@ -11,7 +11,7 @@
     <PropertyGroup>
         <Product>Prism</Product>
         <Description>Automated value splits for Bitcoin.</Description>
-        <Version>1.2.9</Version>
+        <Version>1.3.0</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <!-- Plugin development properties -->

Plugins/BTCPayServer.Plugins.SideShift/BTCPayServer.Plugins.SideShift.csproj

@@ -9,7 +9,7 @@
   <PropertyGroup>
     <Product>SideShift</Product>
     <Description>Allows you to embed a SideShift conversion screen to allow customers to pay with altcoins.</Description>
-    <Version>1.1.14</Version>
+    <Version>1.1.15</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
   <!-- Plugin development properties -->

Plugins/BTCPayServer.Plugins.SideShift/SideShiftController.cs

@@ -201,7 +201,7 @@ namespace BTCPayServer.Plugins.SideShift
                 PullPaymentId = pullPaymentId,
                 Destination = destination.destination,
                 PayoutMethodId = pmi,
-                Value = request.Amount
+                ClaimedAmount = request.Amount
             });
             if (claim.Result == ClaimRequest.ClaimResult.Ok)
             {

Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj

@@ -13,7 +13,7 @@
     <PropertyGroup>
         <Product>Coinjoin</Product>
         <Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
-        <Version>1.0.102</Version>
+        <Version>1.0.103</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 

Plugins/BTCPayServer.Plugins.Wabisabi/Views/WabisabiStore/Spend.cshtml

@@ -5,8 +5,6 @@
 @inject WalletProvider WalletProvider
 @{
     var storeId = _scopeProvider.GetCurrentStoreId();
-    Layout = "../Shared/_NavLayout.cshtml";
-    ViewData["NavPartialName"] = "../UIStores/_Nav";
     ViewData.SetActivePage("Plugins", "BTCPayServer.Views.Stores.StoreNavPages", "Spend", storeId);
     var wallet = (BTCPayWallet) await WalletProvider.GetWalletAsync(storeId);
     var coins = await wallet.GetAllCoins();