From f731bf5e1b0c983d5e23d214a8051d98180875da Mon Sep 17 00:00:00 2001
From: Valera <50830352+ValeraFinebits@users.noreply.github.com>
Date: Wed, 11 Nov 2026 15:27:25 +0200
Subject: [PATCH 1/3] fix: Use Docker network for integration test nodes
---
.../TestUtils/BitcoindNodeOptions.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BTCPayServer.Plugins.Payjoin.IntegrationTests/TestUtils/BitcoindNodeOptions.cs b/BTCPayServer.Plugins.Payjoin.IntegrationTests/TestUtils/BitcoindNodeOptions.cs
index 2192ce57..459e0fb9 100644
--- a/BTCPayServer.Plugins.Payjoin.IntegrationTests/TestUtils/BitcoindNodeOptions.cs
+++ b/BTCPayServer.Plugins.Payjoin.IntegrationTests/TestUtils/BitcoindNodeOptions.cs
@@ -14,6 +14,6 @@ internal sealed record BitcoindNodeOptions
public TimeSpan SyncTimeout { get; init; } = TimeSpan.FromMinutes(1);
public TimeSpan PollInterval { get; init; } = TimeSpan.FromMilliseconds(250);
public Money FundingAmount { get; init; } = Money.Coins(0.15m);
- public string? DockerNetwork { get; init; }
- public string PrimaryNodeEndpoint { get; init; } = "host.docker.internal:39388";
+ public string? DockerNetwork { get; init; } = "btcpayservertests_default";
+ public string PrimaryNodeEndpoint { get; init; } = "bitcoind:39388";
}
From 8c9985f9947b4ad4056066ded5e69abe63708f90 Mon Sep 17 00:00:00 2001
From: Valera <50830352+ValeraFinebits@users.noreply.github.com>
Date: Wed, 11 Nov 2026 15:53:55 +0200
Subject: [PATCH 2/3] ci: Raise inotify limit for integration tests
---
.github/workflows/integration.yml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index aeb29889..0056a4d1 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -42,6 +42,12 @@ jobs:
- name: Set up BTCPay integration test environment
uses: ./.github/actions/prepare-integration-test-env
+ - name: Increase inotify instance limit
+ run: |
+ if [ "$(sysctl -n fs.inotify.max_user_instances)" -lt 1024 ]; then
+ sudo sysctl -w fs.inotify.max_user_instances=1024
+ fi
+
- name: Run integration tests
env:
XUNIT_EXPLICIT_MODE: ${{ github.event_name == 'pull_request' && 'off' || 'on' }}
From 9fb28e50dbb0523856ae8c64261aff9c03e2df1f Mon Sep 17 00:00:00 2001
From: Valera <50830352+ValeraFinebits@users.noreply.github.com>
Date: Wed, 11 Nov 2026 16:17:57 +0200
Subject: [PATCH 3/3] fix: Add System.Formats.Cbor dependency
---
.../BTCPayServer.Plugins.AsyncPayjoin.csproj | 1 +
Directory.Packages.props | 1 +
2 files changed, 2 insertions(+)
diff --git a/BTCPayServer.Plugins.Payjoin/BTCPayServer.Plugins.AsyncPayjoin.csproj b/BTCPayServer.Plugins.Payjoin/BTCPayServer.Plugins.AsyncPayjoin.csproj
index 729a9ea6..3f61bca0 100644
--- a/BTCPayServer.Plugins.Payjoin/BTCPayServer.Plugins.AsyncPayjoin.csproj
+++ b/BTCPayServer.Plugins.Payjoin/BTCPayServer.Plugins.AsyncPayjoin.csproj
@@ -73,6 +73,7 @@
+
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 154a9055..4eaebe7b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -16,6 +16,7 @@
+