Db service

.github/ISSUE_TEMPLATE/bug-general.yml

@@ -7,7 +7,7 @@ body:
       value: |
         ### This issue tracker is only for technical issues related to the following crates:
         - [`payjoin-cli`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-cli)
-        - [`payjoin-directory`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-directory)
+        - [`payjoin-mailroom`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-mailroom)
         - [`payjoin-test-utils`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-test-utils)
         - [`payjoin-ffi`](https://github.com/payjoin/rust-payjoin/tree/master/payjoin-ffi)
 
@@ -27,7 +27,7 @@ body:
       multiple: false
       options:
         - payjoin-cli
-        - payjoin-directory
+        - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
         - ohttp-relay
@@ -56,7 +56,7 @@ body:
     attributes:
       label: What version of the selected crate are you using?
       description:
-        Run `payjoin-cli --version` or `payjoin-directory --version` for the binaries.
+        Run `payjoin-cli --version` or `payjoin-mailroom --version` for the binaries.
         For the library crates (`payjoin-test-utils`, and `payjoin-ffi`),
         check your respective package manager file to see which version you have installed.
       placeholder: e.g. payjoin-0.23.0 or master@ceef77b

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -9,7 +9,7 @@ body:
       options:
         - payjoin
         - payjoin-cli
-        - payjoin-directory
+        - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
         - ohttp-relay

.github/ISSUE_TEMPLATE/general.yml

@@ -8,7 +8,7 @@ body:
       options:
         - payjoin
         - payjoin-cli
-        - payjoin-directory
+        - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
         - ohttp-relay

.github/ISSUE_TEMPLATE/good-first-issue.yml

@@ -9,7 +9,7 @@ body:
       options:
         - payjoin
         - payjoin-cli
-        - payjoin-directory
+        - payjoin-mailroom
         - payjoin-test-utils
         - payjoin-ffi
         - ohttp-relay

.github/workflows/cron-directory-monitor.yml

@@ -8,4 +8,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Check /health endpoint
-        run: cd payjoin-directory && bash contrib/health-check.sh
+        run: cd payjoin-mailroom && bash contrib/health-check.sh

Cargo-minimal.lock

@@ -2825,34 +2825,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "payjoin-directory"
-version = "0.0.3"
-dependencies = [
- "anyhow",
- "bhttp",
- "bitcoin 0.32.8",
- "bitcoin-ohttp",
- "clap 4.5.46",
- "config",
- "futures",
- "http-body-util",
- "hyper",
- "hyper-util",
- "ohttp-relay",
- "payjoin",
- "rand 0.8.5",
- "serde",
- "tempfile",
- "tokio",
- "tokio-rustls",
- "tokio-rustls-acme",
- "tokio-stream",
- "tower",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "payjoin-ffi"
 version = "0.24.0"
@@ -2892,16 +2864,21 @@ dependencies = [
  "anyhow",
  "axum",
  "axum-server",
+ "bhttp",
+ "bitcoin 0.32.8",
+ "bitcoin-ohttp",
  "clap 4.5.46",
  "config",
  "flate2",
+ "futures",
+ "http-body-util",
  "ipnet",
  "maxminddb",
  "ohttp-relay",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry_sdk",
- "payjoin-directory",
+ "payjoin",
  "payjoin-test-utils",
  "rand 0.8.5",
  "reqwest",

Cargo-recent.lock

@@ -2825,34 +2825,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "payjoin-directory"
-version = "0.0.3"
-dependencies = [
- "anyhow",
- "bhttp",
- "bitcoin 0.32.8",
- "bitcoin-ohttp",
- "clap 4.5.46",
- "config",
- "futures",
- "http-body-util",
- "hyper",
- "hyper-util",
- "ohttp-relay",
- "payjoin",
- "rand 0.8.5",
- "serde",
- "tempfile",
- "tokio",
- "tokio-rustls",
- "tokio-rustls-acme",
- "tokio-stream",
- "tower",
- "tracing",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "payjoin-ffi"
 version = "0.24.0"
@@ -2892,16 +2864,21 @@ dependencies = [
  "anyhow",
  "axum",
  "axum-server",
+ "bhttp",
+ "bitcoin 0.32.8",
+ "bitcoin-ohttp",
  "clap 4.5.46",
  "config",
  "flate2",
+ "futures",
+ "http-body-util",
  "ipnet",
  "maxminddb",
  "ohttp-relay",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry_sdk",
- "payjoin-directory",
+ "payjoin",
  "payjoin-test-utils",
  "rand 0.8.5",
  "reqwest",

Cargo.toml

@@ -4,7 +4,6 @@ members = [
   "ohttp-relay",
   "payjoin",
   "payjoin-cli",
-  "payjoin-directory",
   "payjoin-test-utils",
   "payjoin-ffi",
   "payjoin-mailroom",
@@ -15,7 +14,6 @@ resolver = "2"
 payjoin-fuzz = { path = "fuzz" }
 ohttp-relay = { path = "ohttp-relay" }
 payjoin = { path = "payjoin" }
-payjoin-directory = { path = "payjoin-directory" }
 payjoin-mailroom = { path = "payjoin-mailroom" }
 payjoin-test-utils = { path = "payjoin-test-utils" }
 

contrib/test.sh

@@ -24,7 +24,7 @@ if [ -f "$LOCKFILE" ]; then
 fi
 
 DEPS="recent minimal"
-CRATES="ohttp-relay payjoin payjoin-cli payjoin-directory payjoin-ffi payjoin-mailroom"
+CRATES="ohttp-relay payjoin payjoin-cli payjoin-ffi payjoin-mailroom"
 
 for dep in $DEPS; do
     cargo --version

contrib/test_local.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -e
 
-CRATES="ohttp-relay payjoin payjoin-cli payjoin-directory payjoin-ffi payjoin-mailroom"
+CRATES="ohttp-relay payjoin payjoin-cli payjoin-ffi payjoin-mailroom"
 
 cargo --version
 rustc --version

flake.nix

@@ -166,7 +166,6 @@
             {
               "payjoin" = "--features v2";
               "payjoin-cli" = "--features v1,v2";
-              "payjoin-directory" = "";
               "ohttp-relay" = "";
               "payjoin-mailroom" = "--features access-control,acme,telemetry";
             };