Create composed module for core, bitcoind, json-rpc, regtest

alvasw · Sep 4, 2024 · 85e7714 · 85e7714
1 parent 40e63d6
commit 85e7714
Show file tree

Hide file tree

Showing 160 changed files with 58 additions and 37 deletions.
diff --git a/apps/desktop/desktop-app/build.gradle.kts b/apps/desktop/desktop-app/build.gradle.kts
@@ -54,7 +54,7 @@ dependencies {
     implementation(project(":desktop"))
 
     implementation("network:network")
-    implementation("wallets:core")
+    implementation("bitcoind:core")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 

diff --git a/apps/desktop/desktop/build.gradle.kts b/apps/desktop/desktop/build.gradle.kts
@@ -39,7 +39,7 @@ dependencies {
     implementation("network:network")
     implementation("network:network-identity")
 
-    implementation("wallets:core")
+    implementation("bitcoind:core")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 

diff --git a/apps/rest-api-app/build.gradle.kts b/apps/rest-api-app/build.gradle.kts
@@ -27,7 +27,7 @@ dependencies {
 
     implementation("network:network-common")
     implementation("network:network")
-    implementation("wallets:core")
+    implementation("bitcoind:core")
 
     implementation(libs.typesafe.config)
     implementation(libs.bundles.glassfish.jersey)

diff --git a/bisq-easy/build.gradle.kts b/bisq-easy/build.gradle.kts
@@ -20,7 +20,7 @@ dependencies {
 
     implementation("network:network")
     implementation("network:network-identity")
-    implementation("wallets:core")
+    implementation("bitcoind:core")
     // implementation("wallets:electrum")
     // implementation("wallets:bitcoind")
 

diff --git a/wallets/bitcoind/bitcoind/build.gradle.kts b/wallets/bitcoind/bitcoind/build.gradle.kts
@@ -0,0 +1,17 @@
+plugins {
+    id("bisq.java-library")
+    id("bisq.java-integration-tests")
+    id("bisq.protobuf")
+}
+
+dependencies {
+    implementation("bisq:persistence")
+
+    implementation(project(":core"))
+    implementation(project(":json-rpc"))
+
+    implementation(libs.typesafe.config)
+    implementation(libs.jeromq)
+
+    integrationTestImplementation(project(":regtest"))
+}
diff --git a/...indConnectionFailureIntegrationTests.java → ...indConnectionFailureIntegrationTests.java b/...indConnectionFailureIntegrationTests.java → ...indConnectionFailureIntegrationTests.java
diff --git a/...letNameDocumentationIntegrationTests.java → ...letNameDocumentationIntegrationTests.java b/...letNameDocumentationIntegrationTests.java → ...letNameDocumentationIntegrationTests.java
diff --git a/...oindCreateWalletNameIntegrationTests.java → ...oindCreateWalletNameIntegrationTests.java b/...oindCreateWalletNameIntegrationTests.java → ...oindCreateWalletNameIntegrationTests.java
diff --git a/...tcoindListDescriptorsIntegrationTest.java → ...tcoindListDescriptorsIntegrationTest.java b/...tcoindListDescriptorsIntegrationTest.java → ...tcoindListDescriptorsIntegrationTest.java
diff --git a/...BitcoindPsbtMultiSigIntegrationTests.java → ...BitcoindPsbtMultiSigIntegrationTests.java b/...BitcoindPsbtMultiSigIntegrationTests.java → ...BitcoindPsbtMultiSigIntegrationTests.java
diff --git a/.../BitcoindReceiveAddrIntegrationTests.java → .../BitcoindReceiveAddrIntegrationTests.java b/.../BitcoindReceiveAddrIntegrationTests.java → .../BitcoindReceiveAddrIntegrationTests.java
diff --git a/...tcoindSendAndListTxsIntegrationTests.java → ...tcoindSendAndListTxsIntegrationTests.java b/...tcoindSendAndListTxsIntegrationTests.java → ...tcoindSendAndListTxsIntegrationTests.java
diff --git a/...ndSendAndListUnspentIntegrationTests.java → ...ndSendAndListUnspentIntegrationTests.java b/...ndSendAndListUnspentIntegrationTests.java → ...ndSendAndListUnspentIntegrationTests.java
diff --git a/...itcoind/BitcoindSendIntegrationTests.java → ...itcoind/BitcoindSendIntegrationTests.java b/...itcoind/BitcoindSendIntegrationTests.java → ...itcoind/BitcoindSendIntegrationTests.java
diff --git a/...oind/BitcoindSigningIntegrationTests.java → ...oind/BitcoindSigningIntegrationTests.java b/...oind/BitcoindSigningIntegrationTests.java → ...oind/BitcoindSigningIntegrationTests.java
diff --git a/...alletCreationAndListIntegrationTests.java → ...alletCreationAndListIntegrationTests.java b/...alletCreationAndListIntegrationTests.java → ...alletCreationAndListIntegrationTests.java
diff --git a/...BlockHashIntegrationIntegrationTests.java → ...BlockHashIntegrationIntegrationTests.java b/...BlockHashIntegrationIntegrationTests.java → ...BlockHashIntegrationIntegrationTests.java
diff --git a/...ConnectionInfoFinderIntegrationTests.java → ...ConnectionInfoFinderIntegrationTests.java b/...ConnectionInfoFinderIntegrationTests.java → ...ConnectionInfoFinderIntegrationTests.java
diff --git a/...tcoind/AbstractBitcoindWalletService.java → ...tcoind/AbstractBitcoindWalletService.java b/...tcoind/AbstractBitcoindWalletService.java → ...tcoind/AbstractBitcoindWalletService.java
diff --git a/.../bisq/wallets/bitcoind/BitcoinWallet.java → .../bisq/wallets/bitcoind/BitcoinWallet.java b/.../bisq/wallets/bitcoind/BitcoinWallet.java → .../bisq/wallets/bitcoind/BitcoinWallet.java
diff --git a/...allets/bitcoind/BitcoinWalletService.java → ...allets/bitcoind/BitcoinWalletService.java b/...allets/bitcoind/BitcoinWalletService.java → ...allets/bitcoind/BitcoinWalletService.java
diff --git a/.../wallets/bitcoind/BitcoinWalletStore.java → .../wallets/bitcoind/BitcoinWalletStore.java b/.../wallets/bitcoind/BitcoinWalletStore.java → .../wallets/bitcoind/BitcoinWalletStore.java
diff --git a/.../bisq/wallets/bitcoind/WalletFactory.java → .../bisq/wallets/bitcoind/WalletFactory.java b/.../bisq/wallets/bitcoind/WalletFactory.java → .../bisq/wallets/bitcoind/WalletFactory.java
diff --git a/.../wallets/bitcoind/rpc/BitcoindDaemon.java → .../wallets/bitcoind/rpc/BitcoindDaemon.java b/.../wallets/bitcoind/rpc/BitcoindDaemon.java → .../wallets/bitcoind/rpc/BitcoindDaemon.java
diff --git a/.../wallets/bitcoind/rpc/BitcoindWallet.java → .../wallets/bitcoind/rpc/BitcoindWallet.java b/.../wallets/bitcoind/rpc/BitcoindWallet.java → .../wallets/bitcoind/rpc/BitcoindWallet.java
diff --git a/...ls/BitcoindAddMultiSigAddressRpcCall.java → ...ls/BitcoindAddMultiSigAddressRpcCall.java b/...ls/BitcoindAddMultiSigAddressRpcCall.java → ...ls/BitcoindAddMultiSigAddressRpcCall.java
diff --git a/...rpc/calls/BitcoindCombinePsbtRpcCall.java → ...rpc/calls/BitcoindCombinePsbtRpcCall.java b/...rpc/calls/BitcoindCombinePsbtRpcCall.java → ...rpc/calls/BitcoindCombinePsbtRpcCall.java
diff --git a/.../calls/BitcoindCreateMultiSigRpcCall.java → .../calls/BitcoindCreateMultiSigRpcCall.java b/.../calls/BitcoindCreateMultiSigRpcCall.java → .../calls/BitcoindCreateMultiSigRpcCall.java
diff --git a/...pc/calls/BitcoindCreateWalletRpcCall.java → ...pc/calls/BitcoindCreateWalletRpcCall.java b/...pc/calls/BitcoindCreateWalletRpcCall.java → ...pc/calls/BitcoindCreateWalletRpcCall.java
diff --git a/.../BitcoindDecodeRawTransactionRpcCall.java → .../BitcoindDecodeRawTransactionRpcCall.java b/.../BitcoindDecodeRawTransactionRpcCall.java → .../BitcoindDecodeRawTransactionRpcCall.java
diff --git a/...pc/calls/BitcoindFinalizePsbtRpcCall.java → ...pc/calls/BitcoindFinalizePsbtRpcCall.java b/...pc/calls/BitcoindFinalizePsbtRpcCall.java → ...pc/calls/BitcoindFinalizePsbtRpcCall.java
diff --git a/...lls/BitcoindGenerateToAddressRpcCall.java → ...lls/BitcoindGenerateToAddressRpcCall.java b/...lls/BitcoindGenerateToAddressRpcCall.java → ...lls/BitcoindGenerateToAddressRpcCall.java
diff --git a/.../calls/BitcoindGetAddressInfoRpcCall.java → .../calls/BitcoindGetAddressInfoRpcCall.java b/.../calls/BitcoindGetAddressInfoRpcCall.java → .../calls/BitcoindGetAddressInfoRpcCall.java
diff --git a/...rpc/calls/BitcoindGetBalancesRpcCall.java → ...rpc/calls/BitcoindGetBalancesRpcCall.java b/...rpc/calls/BitcoindGetBalancesRpcCall.java → ...rpc/calls/BitcoindGetBalancesRpcCall.java
diff --git a/...lls/BitcoindGetDescriptorInfoRpcCall.java → ...lls/BitcoindGetDescriptorInfoRpcCall.java b/...lls/BitcoindGetDescriptorInfoRpcCall.java → ...lls/BitcoindGetDescriptorInfoRpcCall.java
diff --git a/...c/calls/BitcoindGetNewAddressRpcCall.java → ...c/calls/BitcoindGetNewAddressRpcCall.java b/...c/calls/BitcoindGetNewAddressRpcCall.java → ...c/calls/BitcoindGetNewAddressRpcCall.java
diff --git a/...lls/BitcoindGetRawTransactionRpcCall.java → ...lls/BitcoindGetRawTransactionRpcCall.java b/...lls/BitcoindGetRawTransactionRpcCall.java → ...lls/BitcoindGetRawTransactionRpcCall.java
diff --git a/...c/calls/BitcoindGetTxOutProofRpcCall.java → ...c/calls/BitcoindGetTxOutProofRpcCall.java b/...c/calls/BitcoindGetTxOutProofRpcCall.java → ...c/calls/BitcoindGetTxOutProofRpcCall.java
diff --git a/...s/BitcoindGetZmqNotificationsRpcCall.java → ...s/BitcoindGetZmqNotificationsRpcCall.java b/...s/BitcoindGetZmqNotificationsRpcCall.java → ...s/BitcoindGetZmqNotificationsRpcCall.java
diff --git a/...c/calls/BitcoindImportAddressRpcCall.java → ...c/calls/BitcoindImportAddressRpcCall.java b/...c/calls/BitcoindImportAddressRpcCall.java → ...c/calls/BitcoindImportAddressRpcCall.java
diff --git a/...lls/BitcoindImportDescriptorsRpcCall.java → ...lls/BitcoindImportDescriptorsRpcCall.java b/...lls/BitcoindImportDescriptorsRpcCall.java → ...lls/BitcoindImportDescriptorsRpcCall.java
diff --git a/...rpc/calls/BitcoindImportMultiRpcCall.java → ...rpc/calls/BitcoindImportMultiRpcCall.java b/...rpc/calls/BitcoindImportMultiRpcCall.java → ...rpc/calls/BitcoindImportMultiRpcCall.java
diff --git a/.../BitcoindListAddressGroupingsRpcCall.java → .../BitcoindListAddressGroupingsRpcCall.java b/.../BitcoindListAddressGroupingsRpcCall.java → .../BitcoindListAddressGroupingsRpcCall.java
diff --git a/...calls/BitcoindListDescriptorsRpcCall.java → ...calls/BitcoindListDescriptorsRpcCall.java b/...calls/BitcoindListDescriptorsRpcCall.java → ...calls/BitcoindListDescriptorsRpcCall.java
diff --git a/...alls/BitcoindListTransactionsRpcCall.java → ...alls/BitcoindListTransactionsRpcCall.java b/...alls/BitcoindListTransactionsRpcCall.java → ...alls/BitcoindListTransactionsRpcCall.java
diff --git a/...rpc/calls/BitcoindListUnspentRpcCall.java → ...rpc/calls/BitcoindListUnspentRpcCall.java b/...rpc/calls/BitcoindListUnspentRpcCall.java → ...rpc/calls/BitcoindListUnspentRpcCall.java
diff --git a/...rpc/calls/BitcoindListWalletsRpcCall.java → ...rpc/calls/BitcoindListWalletsRpcCall.java b/...rpc/calls/BitcoindListWalletsRpcCall.java → ...rpc/calls/BitcoindListWalletsRpcCall.java
diff --git a/.../rpc/calls/BitcoindLoadWalletRpcCall.java → .../rpc/calls/BitcoindLoadWalletRpcCall.java b/.../rpc/calls/BitcoindLoadWalletRpcCall.java → .../rpc/calls/BitcoindLoadWalletRpcCall.java
diff --git a/...ls/BitcoindSendRawTransactionRpcCall.java → ...ls/BitcoindSendRawTransactionRpcCall.java b/...ls/BitcoindSendRawTransactionRpcCall.java → ...ls/BitcoindSendRawTransactionRpcCall.java
diff --git a/...c/calls/BitcoindSendToAddressRpcCall.java → ...c/calls/BitcoindSendToAddressRpcCall.java b/...c/calls/BitcoindSendToAddressRpcCall.java → ...c/calls/BitcoindSendToAddressRpcCall.java
diff --git a/...rpc/calls/BitcoindSignMessageRpcCall.java → ...rpc/calls/BitcoindSignMessageRpcCall.java b/...rpc/calls/BitcoindSignMessageRpcCall.java → ...rpc/calls/BitcoindSignMessageRpcCall.java
diff --git a/...tcoind/rpc/calls/BitcoindStopRpcCall.java → ...tcoind/rpc/calls/BitcoindStopRpcCall.java b/...tcoind/rpc/calls/BitcoindStopRpcCall.java → ...tcoind/rpc/calls/BitcoindStopRpcCall.java
diff --git a/...pc/calls/BitcoindUnloadWalletRpcCall.java → ...pc/calls/BitcoindUnloadWalletRpcCall.java b/...pc/calls/BitcoindUnloadWalletRpcCall.java → ...pc/calls/BitcoindUnloadWalletRpcCall.java
diff --git a/...c/calls/BitcoindVerifyMessageRpcCall.java → ...c/calls/BitcoindVerifyMessageRpcCall.java b/...c/calls/BitcoindVerifyMessageRpcCall.java → ...c/calls/BitcoindVerifyMessageRpcCall.java
diff --git a/...itcoindWalletCreateFundedPsbtRpcCall.java → ...itcoindWalletCreateFundedPsbtRpcCall.java b/...itcoindWalletCreateFundedPsbtRpcCall.java → ...itcoindWalletCreateFundedPsbtRpcCall.java
diff --git a/.../rpc/calls/BitcoindWalletLockRpcCall.java → .../rpc/calls/BitcoindWalletLockRpcCall.java b/.../rpc/calls/BitcoindWalletLockRpcCall.java → .../rpc/calls/BitcoindWalletLockRpcCall.java
diff --git a/...alls/BitcoindWalletPassphraseRpcCall.java → ...alls/BitcoindWalletPassphraseRpcCall.java b/...alls/BitcoindWalletPassphraseRpcCall.java → ...alls/BitcoindWalletPassphraseRpcCall.java
diff --git a/...lls/BitcoindWalletProcessPsbtRpcCall.java → ...lls/BitcoindWalletProcessPsbtRpcCall.java b/...lls/BitcoindWalletProcessPsbtRpcCall.java → ...lls/BitcoindWalletProcessPsbtRpcCall.java
diff --git a/...BitcoindImportDescriptorRequestEntry.java → ...BitcoindImportDescriptorRequestEntry.java b/...BitcoindImportDescriptorRequestEntry.java → ...BitcoindImportDescriptorRequestEntry.java
diff --git a/.../requests/BitcoindImportMultiRequest.java → .../requests/BitcoindImportMultiRequest.java b/.../requests/BitcoindImportMultiRequest.java → .../requests/BitcoindImportMultiRequest.java
diff --git a/.../bitcoind/rpc/psbt/BitcoindPsbtInput.java → .../bitcoind/rpc/psbt/BitcoindPsbtInput.java b/.../bitcoind/rpc/psbt/BitcoindPsbtInput.java → .../bitcoind/rpc/psbt/BitcoindPsbtInput.java
diff --git a/...AbstractDecodeRawTransactionResponse.java → ...AbstractDecodeRawTransactionResponse.java b/...AbstractDecodeRawTransactionResponse.java → ...AbstractDecodeRawTransactionResponse.java
diff --git a/...s/bitcoind/rpc/responses/AbstractVin.java → ...s/bitcoind/rpc/responses/AbstractVin.java b/...s/bitcoind/rpc/responses/AbstractVin.java → ...s/bitcoind/rpc/responses/AbstractVin.java
diff --git a/.../bitcoind/rpc/responses/AbstractVout.java → .../bitcoind/rpc/responses/AbstractVout.java b/.../bitcoind/rpc/responses/AbstractVout.java → .../bitcoind/rpc/responses/AbstractVout.java
diff --git a/...nses/BitcoinImportMultiEntryResponse.java → ...nses/BitcoinImportMultiEntryResponse.java b/...nses/BitcoinImportMultiEntryResponse.java → ...nses/BitcoinImportMultiEntryResponse.java
diff --git a/...ndAddOrCreateMultiSigAddressResponse.java → ...ndAddOrCreateMultiSigAddressResponse.java b/...ndAddOrCreateMultiSigAddressResponse.java → ...ndAddOrCreateMultiSigAddressResponse.java
diff --git a/...onses/BitcoindCreateMultiSigResponse.java → ...onses/BitcoindCreateMultiSigResponse.java b/...onses/BitcoindCreateMultiSigResponse.java → ...onses/BitcoindCreateMultiSigResponse.java
diff --git a/...s/BitcoindCreateOrLoadWalletResponse.java → ...s/BitcoindCreateOrLoadWalletResponse.java b/...s/BitcoindCreateOrLoadWalletResponse.java → ...s/BitcoindCreateOrLoadWalletResponse.java
diff --git a/...BitcoindDecodeRawTransactionResponse.java → ...BitcoindDecodeRawTransactionResponse.java b/...BitcoindDecodeRawTransactionResponse.java → ...BitcoindDecodeRawTransactionResponse.java
diff --git a/...ind/rpc/responses/BitcoindDescriptor.java → ...ind/rpc/responses/BitcoindDescriptor.java b/...ind/rpc/responses/BitcoindDescriptor.java → ...ind/rpc/responses/BitcoindDescriptor.java
diff --git a/...sponses/BitcoindFinalizePsbtResponse.java → ...sponses/BitcoindFinalizePsbtResponse.java b/...sponses/BitcoindFinalizePsbtResponse.java → ...sponses/BitcoindFinalizePsbtResponse.java
diff --git a/...onses/BitcoindGetAddressInfoResponse.java → ...onses/BitcoindGetAddressInfoResponse.java b/...onses/BitcoindGetAddressInfoResponse.java → ...onses/BitcoindGetAddressInfoResponse.java
diff --git a/...esponses/BitcoindGetBalancesResponse.java → ...esponses/BitcoindGetBalancesResponse.java b/...esponses/BitcoindGetBalancesResponse.java → ...esponses/BitcoindGetBalancesResponse.java
diff --git a/...es/BitcoindGetDescriptorInfoResponse.java → ...es/BitcoindGetDescriptorInfoResponse.java b/...es/BitcoindGetDescriptorInfoResponse.java → ...es/BitcoindGetDescriptorInfoResponse.java
diff --git a/...etLastProcessedBlockBalancesResponse.java → ...etLastProcessedBlockBalancesResponse.java b/...etLastProcessedBlockBalancesResponse.java → ...etLastProcessedBlockBalancesResponse.java
diff --git a/...nses/BitcoindGetMineBalancesResponse.java → ...nses/BitcoindGetMineBalancesResponse.java b/...nses/BitcoindGetMineBalancesResponse.java → ...nses/BitcoindGetMineBalancesResponse.java
diff --git a/.../BitcoindGetZmqNotificationsResponse.java → .../BitcoindGetZmqNotificationsResponse.java b/.../BitcoindGetZmqNotificationsResponse.java → .../BitcoindGetZmqNotificationsResponse.java
diff --git a/...ses/BitcoindImportDescriptorResponse.java → ...ses/BitcoindImportDescriptorResponse.java b/...ses/BitcoindImportDescriptorResponse.java → ...ses/BitcoindImportDescriptorResponse.java
diff --git a/...BitcoindListAddressGroupingsResponse.java → ...BitcoindListAddressGroupingsResponse.java b/...BitcoindListAddressGroupingsResponse.java → ...BitcoindListAddressGroupingsResponse.java
diff --git a/...onses/BitcoindListDescriptorResponse.java → ...onses/BitcoindListDescriptorResponse.java b/...onses/BitcoindListDescriptorResponse.java → ...onses/BitcoindListDescriptorResponse.java
diff --git a/...ses/BitcoindListTransactionsResponse.java → ...ses/BitcoindListTransactionsResponse.java b/...ses/BitcoindListTransactionsResponse.java → ...ses/BitcoindListTransactionsResponse.java
diff --git a/...esponses/BitcoindListUnspentResponse.java → ...esponses/BitcoindListUnspentResponse.java b/...esponses/BitcoindListUnspentResponse.java → ...esponses/BitcoindListUnspentResponse.java
diff --git a/...d/rpc/responses/BitcoindScriptPubKey.java → ...d/rpc/responses/BitcoindScriptPubKey.java b/...d/rpc/responses/BitcoindScriptPubKey.java → ...d/rpc/responses/BitcoindScriptPubKey.java
diff --git a/...oind/rpc/responses/BitcoindScriptSig.java → ...oind/rpc/responses/BitcoindScriptSig.java b/...oind/rpc/responses/BitcoindScriptSig.java → ...oind/rpc/responses/BitcoindScriptSig.java
diff --git a/...s/bitcoind/rpc/responses/BitcoindVin.java → ...s/bitcoind/rpc/responses/BitcoindVin.java b/...s/bitcoind/rpc/responses/BitcoindVin.java → ...s/bitcoind/rpc/responses/BitcoindVin.java
diff --git a/.../bitcoind/rpc/responses/BitcoindVout.java → .../bitcoind/rpc/responses/BitcoindVout.java b/.../bitcoind/rpc/responses/BitcoindVout.java → .../bitcoind/rpc/responses/BitcoindVout.java
diff --git a/...tcoindWalletCreateFundedPsbtResponse.java → ...tcoindWalletCreateFundedPsbtResponse.java b/...tcoindWalletCreateFundedPsbtResponse.java → ...tcoindWalletCreateFundedPsbtResponse.java
diff --git a/...es/BitcoindWalletProcessPsbtResponse.java → ...es/BitcoindWalletProcessPsbtResponse.java b/...es/BitcoindWalletProcessPsbtResponse.java → ...es/BitcoindWalletProcessPsbtResponse.java
diff --git a/...pc/responses/BitcoindWarningResponse.java → ...pc/responses/BitcoindWarningResponse.java b/...pc/responses/BitcoindWarningResponse.java → ...pc/responses/BitcoindWarningResponse.java
diff --git a/.../bitcoind/zmq/BitcoindRawTxProcessor.java → .../bitcoind/zmq/BitcoindRawTxProcessor.java b/.../bitcoind/zmq/BitcoindRawTxProcessor.java → .../bitcoind/zmq/BitcoindRawTxProcessor.java
diff --git a/...lets/bitcoind/zmq/BitcoindZmqMessage.java → ...lets/bitcoind/zmq/BitcoindZmqMessage.java b/...lets/bitcoind/zmq/BitcoindZmqMessage.java → ...lets/bitcoind/zmq/BitcoindZmqMessage.java
diff --git a/...allets/bitcoind/zmq/BitcoindZmqTopic.java → ...allets/bitcoind/zmq/BitcoindZmqTopic.java b/...allets/bitcoind/zmq/BitcoindZmqTopic.java → ...allets/bitcoind/zmq/BitcoindZmqTopic.java
diff --git a/...q/wallets/bitcoind/zmq/ZmqConnection.java → ...q/wallets/bitcoind/zmq/ZmqConnection.java b/...q/wallets/bitcoind/zmq/ZmqConnection.java → ...q/wallets/bitcoind/zmq/ZmqConnection.java
diff --git a/...ts/bitcoind/zmq/ZmqConnectionFactory.java → ...ts/bitcoind/zmq/ZmqConnectionFactory.java b/...ts/bitcoind/zmq/ZmqConnectionFactory.java → ...ts/bitcoind/zmq/ZmqConnectionFactory.java
diff --git a/...sq/wallets/bitcoind/zmq/ZmqListeners.java → ...sq/wallets/bitcoind/zmq/ZmqListeners.java b/...sq/wallets/bitcoind/zmq/ZmqListeners.java → ...sq/wallets/bitcoind/zmq/ZmqListeners.java
diff --git a/...llets/bitcoind/zmq/ZmqRawTxProcessor.java → ...llets/bitcoind/zmq/ZmqRawTxProcessor.java b/...llets/bitcoind/zmq/ZmqRawTxProcessor.java → ...llets/bitcoind/zmq/ZmqRawTxProcessor.java
diff --git a/...lets/bitcoind/zmq/ZmqTopicProcessors.java → ...lets/bitcoind/zmq/ZmqTopicProcessors.java b/...lets/bitcoind/zmq/ZmqTopicProcessors.java → ...lets/bitcoind/zmq/ZmqTopicProcessors.java
diff --git a/.../bisq/wallets/bitcoind/zmq/ZmqWallet.java → .../bisq/wallets/bitcoind/zmq/ZmqWallet.java b/.../bisq/wallets/bitcoind/zmq/ZmqWallet.java → .../bisq/wallets/bitcoind/zmq/ZmqWallet.java
diff --git a/...ptions/CannotFindZmqAddressException.java → ...ptions/CannotFindZmqAddressException.java b/...ptions/CannotFindZmqAddressException.java → ...ptions/CannotFindZmqAddressException.java
diff --git a/...ceptions/CannotFindZmqTopicException.java → ...ceptions/CannotFindZmqTopicException.java b/...ceptions/CannotFindZmqTopicException.java → ...ceptions/CannotFindZmqTopicException.java
diff --git a/.../zmq/listeners/NewBlockMinedListener.java → .../zmq/listeners/NewBlockMinedListener.java b/.../zmq/listeners/NewBlockMinedListener.java → .../zmq/listeners/NewBlockMinedListener.java
diff --git a/...s/TransactionOutputAddressesListener.java → ...s/TransactionOutputAddressesListener.java b/...s/TransactionOutputAddressesListener.java → ...s/TransactionOutputAddressesListener.java
diff --git a/...nd/zmq/listeners/TxIdInInputListener.java → ...nd/zmq/listeners/TxIdInInputListener.java b/...nd/zmq/listeners/TxIdInInputListener.java → ...nd/zmq/listeners/TxIdInInputListener.java
diff --git a/...ind/src/main/proto/wallets.bitcoind.proto → ...ind/src/main/proto/wallets.bitcoind.proto b/...ind/src/main/proto/wallets.bitcoind.proto → ...ind/src/main/proto/wallets.bitcoind.proto
diff --git a/...allets/bitcoind/WalletNotRunningTest.java → ...allets/bitcoind/WalletNotRunningTest.java b/...allets/bitcoind/WalletNotRunningTest.java → ...allets/bitcoind/WalletNotRunningTest.java
diff --git a/wallets/bitcoind/build.gradle.kts b/wallets/bitcoind/build.gradle.kts
@@ -1,17 +1,4 @@
-plugins {
-    id("bisq.java-library")
-    id("bisq.java-integration-tests")
-    id("bisq.protobuf")
-}
-
-dependencies {
-    implementation("bisq:persistence")
-
-    implementation(project(":core"))
-    implementation(project(":json-rpc"))
-
-    implementation(libs.typesafe.config)
-    implementation(libs.jeromq)
-
-    integrationTestImplementation(project(":regtest"))
+extensions.findByName("buildScan")?.withGroovyBuilder {
+    setProperty("termsOfServiceUrl", "https://gradle.com/terms-of-service")
+    setProperty("termsOfServiceAgree", "yes")
 }
diff --git a/wallets/core/build.gradle.kts → wallets/bitcoind/core/build.gradle.kts b/wallets/core/build.gradle.kts → wallets/bitcoind/core/build.gradle.kts
diff --git a/.../wallets/core/BitcoinWalletSelection.java → .../wallets/core/BitcoinWalletSelection.java b/.../wallets/core/BitcoinWalletSelection.java → .../wallets/core/BitcoinWalletSelection.java
diff --git a/...c/main/java/bisq/wallets/core/Wallet.java → ...c/main/java/bisq/wallets/core/Wallet.java b/...c/main/java/bisq/wallets/core/Wallet.java → ...c/main/java/bisq/wallets/core/Wallet.java
diff --git a/...java/bisq/wallets/core/WalletService.java → ...java/bisq/wallets/core/WalletService.java b/...java/bisq/wallets/core/WalletService.java → ...java/bisq/wallets/core/WalletService.java
diff --git a/...ptions/WalletNotInitializedException.java → ...ptions/WalletNotInitializedException.java b/...ptions/WalletNotInitializedException.java → ...ptions/WalletNotInitializedException.java
diff --git a/.../bisq/wallets/core/model/AddressType.java → .../bisq/wallets/core/model/AddressType.java b/.../bisq/wallets/core/model/AddressType.java → .../bisq/wallets/core/model/AddressType.java
diff --git a/.../bisq/wallets/core/model/Transaction.java → .../bisq/wallets/core/model/Transaction.java b/.../bisq/wallets/core/model/Transaction.java → .../bisq/wallets/core/model/Transaction.java
diff --git a/...q/wallets/core/model/TransactionInfo.java → ...q/wallets/core/model/TransactionInfo.java b/...q/wallets/core/model/TransactionInfo.java → ...q/wallets/core/model/TransactionInfo.java
diff --git a/.../wallets/core/model/TransactionInput.java → .../wallets/core/model/TransactionInput.java b/.../wallets/core/model/TransactionInput.java → .../wallets/core/model/TransactionInput.java
diff --git a/...wallets/core/model/TransactionOutput.java → ...wallets/core/model/TransactionOutput.java b/...wallets/core/model/TransactionOutput.java → ...wallets/core/model/TransactionOutput.java
diff --git a/...in/java/bisq/wallets/core/model/Utxo.java → ...in/java/bisq/wallets/core/model/Utxo.java b/...in/java/bisq/wallets/core/model/Utxo.java → ...in/java/bisq/wallets/core/model/Utxo.java
diff --git a/wallets/bitcoind/gradle.properties b/wallets/bitcoind/gradle.properties
@@ -0,0 +1 @@
+org.gradle.caching=true
diff --git a/wallets/json-rpc/build.gradle.kts → wallets/bitcoind/json-rpc/build.gradle.kts b/wallets/json-rpc/build.gradle.kts → wallets/bitcoind/json-rpc/build.gradle.kts
diff --git a/.../bisq/wallets/json_rpc/DaemonRpcCall.java → .../bisq/wallets/json_rpc/DaemonRpcCall.java b/.../bisq/wallets/json_rpc/DaemonRpcCall.java → .../bisq/wallets/json_rpc/DaemonRpcCall.java
diff --git a/...va/bisq/wallets/json_rpc/JsonRpcCall.java → ...va/bisq/wallets/json_rpc/JsonRpcCall.java b/...va/bisq/wallets/json_rpc/JsonRpcCall.java → ...va/bisq/wallets/json_rpc/JsonRpcCall.java
diff --git a/.../bisq/wallets/json_rpc/JsonRpcClient.java → .../bisq/wallets/json_rpc/JsonRpcClient.java b/.../bisq/wallets/json_rpc/JsonRpcClient.java → .../bisq/wallets/json_rpc/JsonRpcClient.java
diff --git a/...wallets/json_rpc/JsonRpcEndpointSpec.java → ...wallets/json_rpc/JsonRpcEndpointSpec.java b/...wallets/json_rpc/JsonRpcEndpointSpec.java → ...wallets/json_rpc/JsonRpcEndpointSpec.java
diff --git a/...a/bisq/wallets/json_rpc/JsonRpcError.java → ...a/bisq/wallets/json_rpc/JsonRpcError.java b/...a/bisq/wallets/json_rpc/JsonRpcError.java → ...a/bisq/wallets/json_rpc/JsonRpcError.java
diff --git a/...isq/wallets/json_rpc/JsonRpcResponse.java → ...isq/wallets/json_rpc/JsonRpcResponse.java b/...isq/wallets/json_rpc/JsonRpcResponse.java → ...isq/wallets/json_rpc/JsonRpcResponse.java
diff --git a/...n/java/bisq/wallets/json_rpc/RpcCall.java → ...n/java/bisq/wallets/json_rpc/RpcCall.java b/...n/java/bisq/wallets/json_rpc/RpcCall.java → ...n/java/bisq/wallets/json_rpc/RpcCall.java
diff --git a/...ets/json_rpc/RpcCallFailureException.java → ...ets/json_rpc/RpcCallFailureException.java b/...ets/json_rpc/RpcCallFailureException.java → ...ets/json_rpc/RpcCallFailureException.java
diff --git a/...sq/wallets/json_rpc/RpcClientFactory.java → ...sq/wallets/json_rpc/RpcClientFactory.java b/...sq/wallets/json_rpc/RpcClientFactory.java → ...sq/wallets/json_rpc/RpcClientFactory.java
diff --git a/...java/bisq/wallets/json_rpc/RpcConfig.java → ...java/bisq/wallets/json_rpc/RpcConfig.java b/...java/bisq/wallets/json_rpc/RpcConfig.java → ...java/bisq/wallets/json_rpc/RpcConfig.java
diff --git a/...wallets/json_rpc/VoidJsonRpcResponse.java → ...wallets/json_rpc/VoidJsonRpcResponse.java b/...wallets/json_rpc/VoidJsonRpcResponse.java → ...wallets/json_rpc/VoidJsonRpcResponse.java
diff --git a/...tions/InvalidRpcCredentialsException.java → ...tions/InvalidRpcCredentialsException.java b/...tions/InvalidRpcCredentialsException.java → ...tions/InvalidRpcCredentialsException.java
diff --git a/..._rpc/reponses/JsonRpcBooleanResponse.java → ..._rpc/reponses/JsonRpcBooleanResponse.java b/..._rpc/reponses/JsonRpcBooleanResponse.java → ..._rpc/reponses/JsonRpcBooleanResponse.java
diff --git a/...c/reponses/JsonRpcStringListResponse.java → ...c/reponses/JsonRpcStringListResponse.java b/...c/reponses/JsonRpcStringListResponse.java → ...c/reponses/JsonRpcStringListResponse.java
diff --git a/...n_rpc/reponses/JsonRpcStringResponse.java → ...n_rpc/reponses/JsonRpcStringResponse.java b/...n_rpc/reponses/JsonRpcStringResponse.java → ...n_rpc/reponses/JsonRpcStringResponse.java
diff --git a/...son_rpc/reponses/VoidJsonRpcResponse.java → ...son_rpc/reponses/VoidJsonRpcResponse.java b/...son_rpc/reponses/VoidJsonRpcResponse.java → ...son_rpc/reponses/VoidJsonRpcResponse.java
diff --git a/...son-rpc/src/main/proto/wallets.core.proto → ...son-rpc/src/main/proto/wallets.core.proto b/...son-rpc/src/main/proto/wallets.core.proto → ...son-rpc/src/main/proto/wallets.core.proto
diff --git a/...on_rpc/DummyGetBlockChainInfoRpcCall.java → ...on_rpc/DummyGetBlockChainInfoRpcCall.java b/...on_rpc/DummyGetBlockChainInfoRpcCall.java → ...on_rpc/DummyGetBlockChainInfoRpcCall.java
diff --git a/...allets/json_rpc/DummyJsonRpcResponse.java → ...allets/json_rpc/DummyJsonRpcResponse.java b/...allets/json_rpc/DummyJsonRpcResponse.java → ...allets/json_rpc/DummyJsonRpcResponse.java
diff --git a/...q/wallets/json_rpc/JsonRpcClientTest.java → ...q/wallets/json_rpc/JsonRpcClientTest.java b/...q/wallets/json_rpc/JsonRpcClientTest.java → ...q/wallets/json_rpc/JsonRpcClientTest.java
diff --git a/wallets/regtest/build.gradle.kts → wallets/bitcoind/regtest/build.gradle.kts b/wallets/regtest/build.gradle.kts → wallets/bitcoind/regtest/build.gradle.kts
diff --git a/...wallets/regtest/AbstractRegtestSetup.java → ...wallets/regtest/AbstractRegtestSetup.java b/...wallets/regtest/AbstractRegtestSetup.java → ...wallets/regtest/AbstractRegtestSetup.java
diff --git a/...t/AbstractSharedRegtestInstanceTests.java → ...t/AbstractSharedRegtestInstanceTests.java b/...t/AbstractSharedRegtestInstanceTests.java → ...t/AbstractSharedRegtestInstanceTests.java
diff --git a/...sq/wallets/regtest/BitcoindExtension.java → ...sq/wallets/regtest/BitcoindExtension.java b/...sq/wallets/regtest/BitcoindExtension.java → ...sq/wallets/regtest/BitcoindExtension.java
diff --git a/...st/ConnectionFailureIntegrationTests.java → ...st/ConnectionFailureIntegrationTests.java b/...st/ConnectionFailureIntegrationTests.java → ...st/ConnectionFailureIntegrationTests.java
diff --git a/...rc/main/java/bisq/wallets/regtest/Os.java → ...rc/main/java/bisq/wallets/regtest/Os.java b/...rc/main/java/bisq/wallets/regtest/Os.java → ...rc/main/java/bisq/wallets/regtest/Os.java
diff --git a/...q/wallets/regtest/WalletStartupTests.java → ...q/wallets/regtest/WalletStartupTests.java b/...q/wallets/regtest/WalletStartupTests.java → ...q/wallets/regtest/WalletStartupTests.java
diff --git a/...test/bitcoind/BitcoindRegtestProcess.java → ...test/bitcoind/BitcoindRegtestProcess.java b/...test/bitcoind/BitcoindRegtestProcess.java → ...test/bitcoind/BitcoindRegtestProcess.java
diff --git a/...egtest/bitcoind/BitcoindRegtestSetup.java → ...egtest/bitcoind/BitcoindRegtestSetup.java b/...egtest/bitcoind/BitcoindRegtestSetup.java → ...egtest/bitcoind/BitcoindRegtestSetup.java
diff --git a/...lets/regtest/bitcoind/RemoteBitcoind.java → ...lets/regtest/bitcoind/RemoteBitcoind.java b/...lets/regtest/bitcoind/RemoteBitcoind.java → ...lets/regtest/bitcoind/RemoteBitcoind.java
diff --git a/.../wallets/regtest/process/BisqProcess.java → .../wallets/regtest/process/BisqProcess.java b/.../wallets/regtest/process/BisqProcess.java → .../wallets/regtest/process/BisqProcess.java
diff --git a/.../process/CannotStartProcessException.java → .../process/CannotStartProcessException.java b/.../process/CannotStartProcessException.java → .../process/CannotStartProcessException.java
diff --git a/...allets/regtest/process/DaemonProcess.java → ...allets/regtest/process/DaemonProcess.java b/...allets/regtest/process/DaemonProcess.java → ...allets/regtest/process/DaemonProcess.java
diff --git a/...test/process/MultiProcessCoordinator.java → ...test/process/MultiProcessCoordinator.java b/...test/process/MultiProcessCoordinator.java → ...test/process/MultiProcessCoordinator.java
diff --git a/...allets/regtest/process/ProcessConfig.java → ...allets/regtest/process/ProcessConfig.java b/...allets/regtest/process/ProcessConfig.java → ...allets/regtest/process/ProcessConfig.java
diff --git a/...process/WalletStartupFailedException.java → ...process/WalletStartupFailedException.java b/...process/WalletStartupFailedException.java → ...process/WalletStartupFailedException.java
diff --git a/wallets/bitcoind/settings.gradle.kts b/wallets/bitcoind/settings.gradle.kts
@@ -0,0 +1,21 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+    includeBuild("../../build-logic")
+}
+
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+include("core")
+include("bitcoind")
+include("json-rpc")
+include("regtest")
+
+rootProject.name = "bitcoind"
diff --git a/wallets/electrum/build.gradle.kts b/wallets/electrum/build.gradle.kts
@@ -18,16 +18,14 @@ sourceSets {
 }
 
 dependencies {
-    api(project(":core"))
+    api("bitcoind:core")
+    implementation("bitcoind:json-rpc")
+    implementation("bitcoind:regtest")
 
-    implementation("bisq:persistence")
-    implementation(project(":json-rpc"))
     implementation(project(":process"))
-    implementation(project(":regtest"))
-
     implementation(libs.typesafe.config)
     implementation(libs.bundles.glassfish.jersey)
 
-    integrationTestImplementation(project(":bitcoind"))
-    integrationTestImplementation(project(":regtest"))
+    integrationTestImplementation("bitcoind:bitcoind")
+    integrationTestImplementation("bitcoind:regtest")
 }
diff --git a/wallets/elementsd/build.gradle.kts b/wallets/elementsd/build.gradle.kts
@@ -7,9 +7,9 @@ plugins {
 dependencies {
     implementation("bisq:persistence")
 
-    implementation(project(":core"))
-    implementation(project(":bitcoind"))
-    implementation(project(":json-rpc"))
+    implementation("bitcoind:core")
+    implementation("bitcoind:bitcoind")
+    implementation("bitcoind:json-rpc")
 
-    integrationTestImplementation(project(":regtest"))
+    integrationTestImplementation("bitcoind:regtest")
 }
diff --git a/wallets/process/build.gradle.kts b/wallets/process/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":core"))
-    implementation(project(":bitcoind"))
+    implementation("bitcoind:core")
+    implementation("bitcoind:bitcoind")
 
     implementation(libs.assertj.core)
     implementation(libs.junit.jupiter)

diff --git a/wallets/settings.gradle.kts b/wallets/settings.gradle.kts
@@ -14,14 +14,11 @@ dependencyResolutionManagement {
 }
 
 includeBuild("..")
-include("core")
+includeBuild("bitcoind")
 
-include("bitcoind")
 include("electrum")
 include("elementsd")
 
-include("json-rpc")
 include("process")
-include("regtest")
 
 rootProject.name = "wallets"