From 6deba569b7ff10222598412672a52667af4ac8cf Mon Sep 17 00:00:00 2001 From: rorp Date: Mon, 8 Nov 2021 11:53:46 -0800 Subject: [PATCH 1/4] DLC Wallet --- apps/dlc-wallet/data/wallet/.gitkeep | 0 apps/dlc-wallet/docker-compose.yml | 38 ++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 apps/dlc-wallet/data/wallet/.gitkeep create mode 100644 apps/dlc-wallet/docker-compose.yml diff --git a/apps/dlc-wallet/data/wallet/.gitkeep b/apps/dlc-wallet/data/wallet/.gitkeep new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/dlc-wallet/docker-compose.yml b/apps/dlc-wallet/docker-compose.yml new file mode 100644 index 0000000000..5588d2a2a7 --- /dev/null +++ b/apps/dlc-wallet/docker-compose.yml @@ -0,0 +1,38 @@ +version: "3.7" + +services: + web: + image: bitcoinscala/wallet-server-ui:0.0.1-3559ab3e-SNAPSHOT + user: "1000:1000" + restart: on-failure + stop_grace_period: 1m + environment: + ORACLE_SERVER_API_URL: "http://10.21.21.101:9999/" + TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT} + ports: + - "3100:3001" + networks: + default: + ipv4_address: 10.21.21.100 + depends_on: + - walletserver + walletserver: + image: bitcoinscala/bitcoin-s-server:1.8.0-25-09c25626-SNAPSHOT + user: "1000:1000" + restart: on-failure + volumes: + - ${APP_DATA_DIR}/data/wallet:/home/bitcoin-s/.bitcoin-s + environment: + BITCOIN_S_KEYMANAGER_ENTROPY: $APP_SEED + BITCOIN_S_PROXY_ENABLED: false + BITCOIN_S_TOR_ENABLED: false + BITCOIN_S_TOR_PROVIDED: true + BITCOIN_S_DLCNODE_PROXY_ENABLED: true + BITCOIN_S_DLCNODE_PROXY_SOCKS5: "${TOR_PROXY_IP}:${TOR_PROXY_PORT}" + BITCOIN_S_BITCOIND_HOST: $BITCOIN_IP + BITCOIN_S_BITCOIND_PORT: $BITCOIN_RPC_PORT + BITCOIN_S_BITCOIND_USER: $BITCOIN_RPC_USER + BITCOIN_S_BITCOIND_PASSWORD: $BITCOIN_RPC_PASS + networks: + default: + ipv4_address: 10.21.21.101 \ No newline at end of file From 14f20e446308832e5426bf09b889e094aa66a6d6 Mon Sep 17 00:00:00 2001 From: rorp Date: Tue, 16 Nov 2021 13:31:13 -0800 Subject: [PATCH 2/4] update images --- apps/dlc-wallet/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dlc-wallet/docker-compose.yml b/apps/dlc-wallet/docker-compose.yml index 5588d2a2a7..5c30e69f85 100644 --- a/apps/dlc-wallet/docker-compose.yml +++ b/apps/dlc-wallet/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: web: - image: bitcoinscala/wallet-server-ui:0.0.1-3559ab3e-SNAPSHOT + image: bitcoinscala/wallet-server-ui:0.0.1-ae89fdcb-SNAPSHOT user: "1000:1000" restart: on-failure stop_grace_period: 1m @@ -17,7 +17,7 @@ services: depends_on: - walletserver walletserver: - image: bitcoinscala/bitcoin-s-server:1.8.0-25-09c25626-SNAPSHOT + image: bitcoinscala/bitcoin-s-server:1.8.0-38-0b9500f4-SNAPSHOT user: "1000:1000" restart: on-failure volumes: From 873031ba9bcc820100ba4c72f296d82f2d45954b Mon Sep 17 00:00:00 2001 From: rorp Date: Mon, 22 Nov 2021 15:59:18 -0800 Subject: [PATCH 3/4] Set up the ebvironment --- apps/dlc-wallet/docker-compose.yml | 22 ++++++++++++---------- scripts/app | 2 ++ scripts/configure | 8 ++++++++ templates/.env-sample | 4 ++++ templates/torrc-apps-3-sample | 10 ++++++++++ 5 files changed, 36 insertions(+), 10 deletions(-) diff --git a/apps/dlc-wallet/docker-compose.yml b/apps/dlc-wallet/docker-compose.yml index 5c30e69f85..42918d9c3a 100644 --- a/apps/dlc-wallet/docker-compose.yml +++ b/apps/dlc-wallet/docker-compose.yml @@ -2,37 +2,39 @@ version: "3.7" services: web: - image: bitcoinscala/wallet-server-ui:0.0.1-ae89fdcb-SNAPSHOT + image: bitcoinscala/wallet-server-ui:0.0.1-3619c6d4-SNAPSHOT user: "1000:1000" restart: on-failure stop_grace_period: 1m environment: - ORACLE_SERVER_API_URL: "http://10.21.21.101:9999/" + WALLET_SERVER_API_URL: "http://${APP_DLC_WALLET_SERVER_IP}:9999/" TOR_PROXY: socks5://${TOR_PROXY_IP}:${TOR_PROXY_PORT} ports: - - "3100:3001" + - "${APP_DLC_WALLET_PORT}:3002" networks: default: - ipv4_address: 10.21.21.100 + ipv4_address: $APP_DLC_WALLET_IP depends_on: - walletserver walletserver: - image: bitcoinscala/bitcoin-s-server:1.8.0-38-0b9500f4-SNAPSHOT + image: bitcoinscala/bitcoin-s-server:1.8.0-46-90e01d7f-SNAPSHOT user: "1000:1000" restart: on-failure volumes: - ${APP_DATA_DIR}/data/wallet:/home/bitcoin-s/.bitcoin-s environment: + BITCOIN_S_NETWORK: $BITCOIN_NETWORK BITCOIN_S_KEYMANAGER_ENTROPY: $APP_SEED - BITCOIN_S_PROXY_ENABLED: false - BITCOIN_S_TOR_ENABLED: false - BITCOIN_S_TOR_PROVIDED: true - BITCOIN_S_DLCNODE_PROXY_ENABLED: true + BITCOIN_S_PROXY_ENABLED: "false" + BITCOIN_S_TOR_ENABLED: "false" + BITCOIN_S_TOR_PROVIDED: "true" + BITCOIN_S_DLCNODE_PROXY_ENABLED: "true" BITCOIN_S_DLCNODE_PROXY_SOCKS5: "${TOR_PROXY_IP}:${TOR_PROXY_PORT}" + BITCOIN_S_DLCNODE_EXTERNAL_IP: $DLC_WALLET_P2P_HIDDEN_SERVICE BITCOIN_S_BITCOIND_HOST: $BITCOIN_IP BITCOIN_S_BITCOIND_PORT: $BITCOIN_RPC_PORT BITCOIN_S_BITCOIND_USER: $BITCOIN_RPC_USER BITCOIN_S_BITCOIND_PASSWORD: $BITCOIN_RPC_PASS networks: default: - ipv4_address: 10.21.21.101 \ No newline at end of file + ipv4_address: $APP_DLC_WALLET_SERVER_IP diff --git a/scripts/app b/scripts/app index c23cd51a04..50aa91bb99 100755 --- a/scripts/app +++ b/scripts/app @@ -124,6 +124,7 @@ compose() { local dojo_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-dojo/hostname" local whirlpool_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-whirlpool/hostname" local squeaknode_p2p_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-p2p/hostname" + local dlc_wallet_p2p_hidden_service_file="${UMBREL_ROOT}/tor/data/app-${app}-p2p/hostname" export SAMOURAI_SERVER_DOJO_HIDDEN_SERVICE="$(cat "${dojo_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" export SAMOURAI_SERVER_WHIRLPOOL_HIDDEN_SERVICE="$(cat "${whirlpool_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" export SAMOURAI_SERVER_NODE_API_KEY=$(derive_entropy "env-${app_entropy_identifier}-NODE_API_KEY") @@ -131,6 +132,7 @@ compose() { export SAMOURAI_SERVER_NODE_JWT_SECRET=$(derive_entropy "env-${app_entropy_identifier}-NODE_JWT_SECRET") export SAMOURAI_SERVER_WHIRLPOOL_API_KEY=$(derive_entropy "env-${app_entropy_identifier}-WHIRLPOOL_API_KEY") export SQUEAKNODE_P2P_HIDDEN_SERVICE="$(cat "${squeaknode_p2p_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" + export DLC_WALLET_P2P_HIDDEN_SERVICE="$(cat "${dlc_wallet_p2p_hidden_service_file}" 2>/dev/null || echo "notyetset.onion")" docker-compose \ --env-file "${env_file}" \ diff --git a/scripts/configure b/scripts/configure index 95c8eab427..8994aa60f7 100755 --- a/scripts/configure +++ b/scripts/configure @@ -211,6 +211,10 @@ APP_LNMARKETS_IP="10.21.21.58" APP_LNMARKETS_PORT="4242" APP_ELECTRUMX_IP="10.21.21.59" APP_ELECTRUMX_PORT="55001" +APP_DLC_WALLET_IP="10.21.21.100" +APP_DLC_WALLET_SERVER_IP="10.21.21.101" +APP_DLC_WALLET_PORT="3020" +APP_DLC_WALLET_P2P_PORT="2862" # Generate RPC credentials if [[ -z ${BITCOIN_RPC_USER+x} ]] || [[ -z ${BITCOIN_RPC_PASS+x} ]] || [[ -z ${BITCOIN_RPC_AUTH+x} ]]; then @@ -419,6 +423,10 @@ for template in "${NGINX_CONF_FILE}" "${BITCOIN_CONF_FILE}" "${LND_CONF_FILE}" " sed -i "s//${APP_LNMARKETS_PORT}/g" "${template}" sed -i "s//${APP_ELECTRUMX_IP}/g" "${template}" sed -i "s//${APP_ELECTRUMX_PORT}/g" "${template}" + sed -i "s//${APP_DLC_WALLET_IP}/g" "${template}" + sed -i "s//${APP_DLC_WALLET_SERVER_IP}/g" "${template}" + sed -i "s//${APP_DLC_WALLET_PORT}/g" "${template}" + sed -i "s//${APP_DLC_WALLET_P2P_PORT}/g" "${template}" done ########################################################## diff --git a/templates/.env-sample b/templates/.env-sample index 1d8db64617..5588b712a4 100644 --- a/templates/.env-sample +++ b/templates/.env-sample @@ -105,3 +105,7 @@ APP_LNMARKETS_IP= APP_LNMARKETS_PORT= APP_ELECTRUMX_IP= APP_ELECTRUMX_PORT= +APP_DLC_WALLET_IP= +APP_DLC_WALLET_SERVER_IP= +APP_DLC_WALLET_PORT= +APP_DLC_WALLET_P2P_PORT= diff --git a/templates/torrc-apps-3-sample b/templates/torrc-apps-3-sample index d1c440e64b..d7623ead60 100644 --- a/templates/torrc-apps-3-sample +++ b/templates/torrc-apps-3-sample @@ -36,3 +36,13 @@ HiddenServicePort 80 : # electrumx Hidden Service HiddenServiceDir /var/lib/tor/app-electrumx HiddenServicePort 50001 :50001 + +# dlc-wallet Hidden Service +HiddenServiceDir /var/lib/tor/app-dlc-wallet +HiddenServicePort 80 : + + +# dlc-wallet p2p Hidden Service +HiddenServiceDir /var/lib/tor/app-dlc-wallet-p2p +HiddenServicePort : + From 38b18b1c034f315ff607ae6b8150914cda582f3e Mon Sep 17 00:00:00 2001 From: rorp Date: Sun, 5 Dec 2021 15:08:39 -0800 Subject: [PATCH 4/4] update docker images --- apps/dlc-wallet/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dlc-wallet/docker-compose.yml b/apps/dlc-wallet/docker-compose.yml index 42918d9c3a..a0da484a13 100644 --- a/apps/dlc-wallet/docker-compose.yml +++ b/apps/dlc-wallet/docker-compose.yml @@ -2,7 +2,7 @@ version: "3.7" services: web: - image: bitcoinscala/wallet-server-ui:0.0.1-3619c6d4-SNAPSHOT + image: bitcoinscala/wallet-server-ui:0.0.1-f1486000-SNAPSHOT user: "1000:1000" restart: on-failure stop_grace_period: 1m @@ -17,7 +17,7 @@ services: depends_on: - walletserver walletserver: - image: bitcoinscala/bitcoin-s-server:1.8.0-46-90e01d7f-SNAPSHOT + image: bitcoinscala/bitcoin-s-server:1.8.0-60-6e7af37c-SNAPSHOT user: "1000:1000" restart: on-failure volumes: