aljaz/BTCPayServerPlugins
1
0
Fork 0
mirror of https://github.com/aljazceru/BTCPayServerPlugins.git synced 2025-12-17 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

upd btcpay to 2.2

Browse Source
This commit is contained in:
Andrew Camilleri (Kukks)
2025-09-04 10:45:30 +02:00
parent 62ce03e8a2
commit a5525eade4
6 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Plugins/BTCPayServer.Plugins.Breez/BTCPayServer.Plugins.Breez.csproj
View File

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

6
Plugins/BTCPayServer.Plugins.Breez/BreezController.cs
View File

@@ -275,7 +275,11 @@ public class BreezController : Controller
try 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}"; TempData[WellKnownTempData.SuccessMessage] = $"swap out created: {result.reverseSwapInfo.id}";
} }
catch (Exception e) catch (Exception e)

36
Plugins/BTCPayServer.Plugins.Breez/BreezLightningClient.cs
View File

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

2
Plugins/BTCPayServer.Plugins.Breez/BreezPlugin.cs
View File

@@ -12,7 +12,7 @@ namespace BTCPayServer.Plugins.Breez
{ {
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = 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) public override void Execute(IServiceCollection applicationBuilder)

2
Plugins/BTCPayServer.Plugins.Breez/Views/Breez/SwapOut.cshtml
View File

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

2
submodules/btcpayserver

Submodule submodules/btcpayserver updated: f4df9632e6...7932abd8b5