From d496f0bfb52777d0eb5725d4e4659638595498d5 Mon Sep 17 00:00:00 2001
From: AaronDewes <aaron.dewes@protonmail.com>
Date: Fri, 28 Oct 2022 18:17:17 +0000
Subject: [PATCH] WIP: I2P

---
 .gitignore                    |  4 ++--
 docker-compose.yml            | 16 +++++-----------
 {redis => i2p}/.gitkeep       |  0
 scripts/configure             |  6 ++++--
 templates/.env-sample         |  2 +-
 templates/bitcoin-sample.conf |  3 +++
 templates/i2p-sample.conf     |  6 ++++++
 7 files changed, 21 insertions(+), 16 deletions(-)
 rename {redis => i2p}/.gitkeep (100%)
 create mode 100644 templates/i2p-sample.conf

diff --git a/.gitignore b/.gitignore
index cd57ec0..3907c71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,7 +24,7 @@ apps
 electrs/*
 fulcrum/*
 nginx/*
-redis/*
+i2p/*
 docker-compose.override.yml
 
 # Commit these empty directories
@@ -42,7 +42,7 @@ db/citadel-seed/*
 !tor/.gitkeep
 !db/.gitkeep
 !nginx/.gitkeep
-!redis/.gitkeep
+!i2p/.gitkeep
 !fulcrum/.gitkeep
 
 !**/*.license
diff --git a/docker-compose.yml b/docker-compose.yml
index b8211e0..870d45b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -113,7 +113,6 @@ services:
     image: ghcr.io/runcitadel/manager:deno@sha256:fa5bd47fc5a19095a26f1660d8d64fb571d24b476cddf4f6e61ae0e7690caf87
     depends_on:
     - tor
-    - redis
     restart: on-failure
     init: true
     stop_grace_period: 5m30s
@@ -152,9 +151,6 @@ services:
       TOR_PROXY_PORT: ${TOR_PROXY_PORT}
       TOR_HIDDEN_SERVICE_DIR: /var/lib/tor
       IS_CITADEL_OS: ${IS_CITADEL_OS:-"true"}
-      REDIS_PASSWORD: freedom
-      REDIS_IP: $REDIS_IP
-      REDIS_PORT: 6379
       UNSAFE_REMOVE_CORS_CHECK: true
     networks:
       default:
@@ -165,7 +161,6 @@ services:
     depends_on:
     - bitcoin
     - lightning
-    - redis
     command: sh -c "./wait-for-manager.sh $MANAGER_IP && ././start.sh"
     restart: on-failure
     volumes:
@@ -205,20 +200,19 @@ services:
     networks:
       default:
         ipv4_address: $NEUTRINO_SWITCHER_IP
-  redis:
-    container_name: redis
+  i2p:
+    container_name: i2p
     user: 1000:1000
-    image: redis:7.0.0-bullseye@sha256:ad0705f2e2344c4b642449e658ef4669753d6eb70228d46267685045bf932303
+    image: purplei2p/i2pd:latest@sha256:d8e1a28a8428ed9bda15bbf773e355cf46c89c652dcaa6cd9131606ee308ae47
     working_dir: /data
     volumes:
-    - ${PWD}/redis:/data
-    command: redis-server --requirepass freedom
+    - ${PWD}/i2p:/home/i2pd/data
     restart: on-failure
     stop_grace_period: 1m
     init: true
     networks:
       default:
-        ipv4_address: $REDIS_IP
+        ipv4_address: $I2P_IP
 
 networks:
   default:
diff --git a/redis/.gitkeep b/i2p/.gitkeep
similarity index 100%
rename from redis/.gitkeep
rename to i2p/.gitkeep
diff --git a/scripts/configure b/scripts/configure
index 4196f15..2cfa9fd 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -256,7 +256,7 @@ TOR_PROXY_IP="10.21.21.11"
 APPS_TOR_IP="10.21.21.12"
 APPS_2_TOR_IP="10.21.21.13"
 APPS_3_TOR_IP="10.21.21.14"
-REDIS_IP="10.21.21.15"
+i2P_IP="10.21.21.15"
 
 # Ports
 BITCOIN_RPC_PORT="8332"
@@ -268,6 +268,7 @@ BITCOIN_ZMQ_SEQUENCE_PORT="28335"
 LND_GRPC_PORT="10009"
 LND_REST_PORT="8080"
 TOR_PROXY_PORT="9050"
+I2P_SAM_PORT="7656"
 TOR_CONTROL_PORT="29051"
 
 DEVICE_HOSTNAME=""
@@ -316,7 +317,8 @@ templates_to_build = {
   "./templates/lnd-sample.conf": "./lnd/lnd.conf",
   "./templates/bitcoin-sample.conf": "./bitcoin/bitcoin.conf",
   "./templates/.env-sample": "./.env",
-  "./templates/nginx-sample.conf": "./nginx/nginx.conf"
+  "./templates/nginx-sample.conf": "./nginx/nginx.conf",
+  "./templates/i2p-sample.conf": "./i2p/i2pd.conf"
 }
 
 print("Generating configuration files...")
diff --git a/templates/.env-sample b/templates/.env-sample
index dc5502e..3bd5536 100644
--- a/templates/.env-sample
+++ b/templates/.env-sample
@@ -15,7 +15,7 @@ DASHBOARD_NEW_IP=<dashboard-new-ip>
 MANAGER_IP=<manager-ip>
 MIDDLEWARE_IP=<middleware-ip>
 NEUTRINO_SWITCHER_IP=<neutrino-switcher-ip>
-REDIS_IP=<redis-ip>
+I2P_IP=<i2p-ip>
 BITCOIN_NETWORK=<bitcoin-network>
 BITCOIN_IP=<bitcoin-ip>
 BITCOIN_P2P_PORT=<bitcoin-p2p-port>
diff --git a/templates/bitcoin-sample.conf b/templates/bitcoin-sample.conf
index 2b99d55..bfb3e22 100644
--- a/templates/bitcoin-sample.conf
+++ b/templates/bitcoin-sample.conf
@@ -9,6 +9,9 @@
 proxy=<tor-proxy-ip>:<tor-proxy-port>
 listen=1
 
+# I2P
+i2psam=<i2p-ip>-<i2p-sam-port>
+
 # Mainnet/Testnet/Signet/regtest
 <bitcoin-network>=1
 
diff --git a/templates/i2p-sample.conf b/templates/i2p-sample.conf
new file mode 100644
index 0000000..e72344b
--- /dev/null
+++ b/templates/i2p-sample.conf
@@ -0,0 +1,6 @@
+log = true
+
+[sam]
+enabled = true
+port = <i2p-sam-port>
+address = <i2p-ip>
\ No newline at end of file