From 7feecc9aca2327d4e5e6afe98fbe76b3636ecd47 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 21 May 2022 17:03:14 -0300
Subject: [PATCH 1/4] Adjust to CJDNS network support in bitcoin-core v23

This change is backward compatible for bitcoin-core v22.
This change has not been tested against bitcoin-core v21, v20, v19.

See https://github.com/bitcoin/bitcoin/blob/master/doc/release-notes/release-notes-23.0.md#p2p-and-network-changes
See https://github.com/bitcoin/bitcoin/blob/23.x/doc/cjdns.md
---
 .../bisq/core/dao/node/full/rpc/dto/DtoNetworkInfo.java     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/bisq/core/dao/node/full/rpc/dto/DtoNetworkInfo.java b/core/src/main/java/bisq/core/dao/node/full/rpc/dto/DtoNetworkInfo.java
index 3cbd07d124..ae3ea69f2b 100644
--- a/core/src/main/java/bisq/core/dao/node/full/rpc/dto/DtoNetworkInfo.java
+++ b/core/src/main/java/bisq/core/dao/node/full/rpc/dto/DtoNetworkInfo.java
@@ -91,7 +91,11 @@ public class DtoNetworkInfo {
 
     @RequiredArgsConstructor
     public enum NetworkType {
-        IPV4("ipv4"), IPV6("ipv6"), ONION("onion"), I2P("i2p");
+        IPV4("ipv4"),
+        IPV6("ipv6"),
+        ONION("onion"),
+        I2P("i2p"),
+        CJDNS("cjdns");
 
         @Getter(onMethod_ = @JsonValue)
         private final String name;

From 3fe72b7425e0149455447214f3c09dada27890da Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 21 May 2022 17:07:06 -0300
Subject: [PATCH 2/4] Remove -txindex=1 from seednode's bitcoin.conf

This change needs thorough review before being merged.

See bitcoin-core Issue "Remove txindex migration code #22626":
  https://github.com/bitcoin/bitcoin/pull/22626
And comment about change not having a release note:
  https://github.com/bitcoin/bitcoin/pull/22626#issuecomment-893220371

See src:   https://github.com/bitcoin/bitcoin/blob/v23.0/src/txdb.cpp#L35

For API test suites:
  This change is backward compatible for bitcoin-core v22.
  This change has not been tested against bitcoin-core v21, v20, v19.

Change needs to be thoroughly tested with desktop UI.
---
 seednode/bitcoin.conf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/seednode/bitcoin.conf b/seednode/bitcoin.conf
index f1b685ec9c..7e1a200483 100644
--- a/seednode/bitcoin.conf
+++ b/seednode/bitcoin.conf
@@ -2,7 +2,6 @@ server=1
 daemon=1
 listen=1
 discover=1
-txindex=1
 dbcache=1337
 maxconnections=1337
 peerbloomfilters=1

From 950638675357f16a38f16f79d9df54f8fbd05fb3 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Sat, 21 May 2022 17:14:05 -0300
Subject: [PATCH 3/4] Do not run test daemon in debug mode (by default)

Thie test case is @Disabled anyway, but run inside a suite instead,
where it was not running the test daemon in debug mode (anyway).
---
 .../src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java b/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java
index 550695e353..59eeab906a 100644
--- a/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java
+++ b/apitest/src/test/java/bisq/apitest/method/wallet/BtcWalletTest.java
@@ -41,7 +41,7 @@ public class BtcWalletTest extends MethodTest {
     @BeforeAll
     public static void setUp() {
         startSupportingApps(false,
-                true,
+                false,
                 bitcoind,
                 seednode,
                 alicedaemon,

From 3c5b04b8aa0bcabb6778493d2000aa953e9e2d83 Mon Sep 17 00:00:00 2001
From: ghubstan <36207203+ghubstan@users.noreply.github.com>
Date: Mon, 4 Jul 2022 12:17:57 -0300
Subject: [PATCH 4/4] Revert "Remove -txindex=1 from seednode's bitcoin.conf"

This reverts commit 3fe72b7425e0149455447214f3c09dada27890da.

I made a mistake while testing this PR with API, and thought this txindex
option was breaking the regtest BSQ wallet.  The TX Index has been moved
to another database, and the -txindex option is still a valid option.

  $ bitcoind --version
  Bitcoin Core version v23.0.0

  $ bitcoind --help
    ...
    -txindex
       Maintain a full transaction index, used by the getrawtransaction rpc
       call (default: 0)
---
 seednode/bitcoin.conf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/seednode/bitcoin.conf b/seednode/bitcoin.conf
index 7e1a200483..f1b685ec9c 100644
--- a/seednode/bitcoin.conf
+++ b/seednode/bitcoin.conf
@@ -2,6 +2,7 @@ server=1
 daemon=1
 listen=1
 discover=1
+txindex=1
 dbcache=1337
 maxconnections=1337
 peerbloomfilters=1