upd btcpay to 2.2

Plugins/BTCPayServer.Plugins.Breez/BTCPayServer.Plugins.Breez.csproj

@@ -9,7 +9,7 @@
     <PropertyGroup>
         <Product>Breez / Greenlight</Product>
         <Description>Lightweight lightning baby!</Description>
-        <Version>1.0.10</Version>
+        <Version>1.0.11</Version>
 <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <!-- Plugin development properties -->
@@ -34,7 +34,7 @@
         <ProjectReference Include="..\..\submodules\btcpayserver\BTCPayServer\BTCPayServer.csproj" />
     </ItemGroup>
     <ItemGroup>
-      <PackageReference Include="Breez.Sdk" Version="0.6.1" />
+      <PackageReference Include="Breez.Sdk" Version="0.8.1-rc3" />
     </ItemGroup>
 </Project>
 

Plugins/BTCPayServer.Plugins.Breez/BreezController.cs

@@ -275,7 +275,11 @@ public class BreezController : Controller
 
         try
         {
-            var result = client.Sdk.SendOnchain(new SendOnchainRequest(amount, address, feesHash, satPerByte));
+            
+            
+            var prep = client.Sdk.PrepareOnchainPayment(new PrepareOnchainPaymentRequest(amount, SwapAmountType.Send, satPerByte));
+            var result = client.Sdk.PayOnchain(new PayOnchainRequest(address, prep));
+            // var result = client.Sdk.SendSpontaneousPayment(new SendSpontaneousPaymentRequestew SendOnchainRequest(amount, address, feesHash, satPerByte));
             TempData[WellKnownTempData.SuccessMessage] = $"swap out created: {result.reverseSwapInfo.id}";
         }
         catch (Exception e)

Plugins/BTCPayServer.Plugins.Breez/BreezLightningClient.cs

@@ -42,15 +42,15 @@ public class BreezLightningClient : ILightningClient, IDisposable, EventListener
             new GreenlightNodeConfig(glCreds, inviteCode)
         );
         var config = BreezSdkMethods.DefaultConfig(
-                network == NBitcoin.Network.Main ? EnvironmentType.PRODUCTION : EnvironmentType.STAGING,
+                network == NBitcoin.Network.Main ? EnvironmentType.Production : EnvironmentType.Staging,
                 apiKey,
                 nodeConfig
             ) with
             {
                 workingDir = workingDir,
-                network = network == NBitcoin.Network.Main ? Network.BITCOIN :
-                network == NBitcoin.Network.TestNet ? Network.TESTNET :
-                network == NBitcoin.Network.RegTest ? Network.REGTEST : Network.SIGNET
+                network = network == NBitcoin.Network.Main ? Network.Bitcoin :
+                network == NBitcoin.Network.TestNet ? Network.Testnet :
+                network == NBitcoin.Network.RegTest ? Network.Regtest : Network.Signet
             };
         var seed = mnemonic.DeriveSeed();
         Sdk = BreezSdkMethods.Connect(new ConnectRequest(config, seed.ToList()), this);
@@ -99,9 +99,9 @@ public class BreezLightningClient : ILightningClient, IDisposable, EventListener
             BOLT11 = lnPaymentDetails.data.bolt11,
             Status = payment.status switch
             {
-                PaymentStatus.FAILED => LightningPaymentStatus.Failed,
-                PaymentStatus.COMPLETE => LightningPaymentStatus.Complete,
-                PaymentStatus.PENDING => LightningPaymentStatus.Pending,
+                PaymentStatus.Failed => LightningPaymentStatus.Failed,
+                PaymentStatus.Complete => LightningPaymentStatus.Complete,
+                PaymentStatus.Pending => LightningPaymentStatus.Pending,
                 _ => throw new ArgumentOutOfRangeException()
             },
             CreatedAt = DateTimeOffset.FromUnixTimeMilliseconds(payment.paymentTime),
@@ -129,9 +129,9 @@ public class BreezLightningClient : ILightningClient, IDisposable, EventListener
             BOLT11 = lnPaymentDetails.data.bolt11,
             Status = p.status switch
             {
-                PaymentStatus.PENDING => LightningInvoiceStatus.Unpaid,
-                PaymentStatus.FAILED => LightningInvoiceStatus.Expired,
-                PaymentStatus.COMPLETE => LightningInvoiceStatus.Paid,
+                PaymentStatus.Pending => LightningInvoiceStatus.Unpaid,
+                PaymentStatus.Failed => LightningInvoiceStatus.Expired,
+                PaymentStatus.Complete => LightningInvoiceStatus.Paid,
                 _ => LightningInvoiceStatus.Unpaid
             },
             PaidAt = DateTimeOffset.FromUnixTimeSeconds(p.paymentTime),
@@ -162,7 +162,7 @@ public class BreezLightningClient : ILightningClient, IDisposable, EventListener
     public async Task<LightningInvoice[]> ListInvoices(ListInvoicesParams request,
         CancellationToken cancellation = default)
     {
-        return Sdk.ListPayments(new ListPaymentsRequest(new List<PaymentTypeFilter>(){PaymentTypeFilter.RECEIVED}, null, null,
+        return Sdk.ListPayments(new ListPaymentsRequest(new List<PaymentTypeFilter>(){PaymentTypeFilter.Received}, null, null,
                 null, request?.PendingOnly is not true, (uint?) request?.OffsetIndex, null))
             .Select(FromPayment).ToArray();
     }
@@ -180,7 +180,7 @@ public class BreezLightningClient : ILightningClient, IDisposable, EventListener
     public async Task<LightningPayment[]> ListPayments(ListPaymentsParams request,
         CancellationToken cancellation = default)
     {
-        return Sdk.ListPayments(new ListPaymentsRequest(new List<PaymentTypeFilter>(){PaymentTypeFilter.RECEIVED}, null, null, null,
+        return Sdk.ListPayments(new ListPaymentsRequest(new List<PaymentTypeFilter>(){PaymentTypeFilter.Received}, null, null, null,
           null,      (uint?) request?.OffsetIndex, null))
             .Select(ToLightningPayment).ToArray();
     }
@@ -283,18 +283,18 @@ public class BreezLightningClient : ILightningClient, IDisposable, EventListener
             {
                 Result = result.payment.status switch
                 {
-                    PaymentStatus.FAILED => PayResult.Error,
-                    PaymentStatus.COMPLETE => PayResult.Ok,
-                    PaymentStatus.PENDING => PayResult.Unknown,
+                    PaymentStatus.Failed => PayResult.Error,
+                    PaymentStatus.Complete => PayResult.Ok,
+                    PaymentStatus.Pending => PayResult.Unknown,
                     _ => throw new ArgumentOutOfRangeException()
                 },
                 Details = new PayDetails()
                 {
                     Status = result.payment.status switch
                     {
-                        PaymentStatus.FAILED => LightningPaymentStatus.Failed,
-                        PaymentStatus.COMPLETE => LightningPaymentStatus.Complete,
-                        PaymentStatus.PENDING => LightningPaymentStatus.Pending,
+                        PaymentStatus.Failed => LightningPaymentStatus.Failed,
+                        PaymentStatus.Complete => LightningPaymentStatus.Complete,
+                        PaymentStatus.Pending => LightningPaymentStatus.Pending,
                         _ => LightningPaymentStatus.Unknown
                     },
                     Preimage =

Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs

@@ -12,7 +12,7 @@ namespace BTCPayServer.Plugins.Breez
     {
         public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
         {
-            new() { Identifier = nameof(BTCPayServer), Condition = ">=2.0.6" }
+            new() { Identifier = nameof(BTCPayServer), Condition = ">=2.2.0" }
         };
 
         public override void Execute(IServiceCollection applicationBuilder)

Plugins/BTCPayServer.Plugins.Breez/Views/Breez/SwapOut.cshtml

@@ -29,7 +29,7 @@
     var sdk = BreezService.GetClient(storeId)?.Sdk;
     if (sdk is null)
         return;
-    var inProgressSwaps = sdk.InProgressReverseSwaps();
+    var inProgressSwaps = sdk.InProgressOnchainPayments();
     var deriv = Context.GetStoreData().GetDerivationSchemeSettings(PaymentMethodHandlerDictionary, "BTC");
     var f = sdk.RecommendedFees();
     var swapOutRec = sdk.FetchReverseSwapFees(new ReverseSwapFeesRequest());