From 395c9d1b6854e581af2b726d3aa4257d382490b7 Mon Sep 17 00:00:00 2001 From: lza_menace Date: Fri, 20 Dec 2024 10:33:07 -0800 Subject: [PATCH] updating to include btcpayserver fork in repo --- .gitignore | 1 + .gitmodules | 3 ++ Dockerfile | 4 ++- README.md | 2 ++ btcpayserver | 1 + docker-compose.yaml | 79 +++++++++++++++++++++++---------------------- run_wallet.sh | 13 +++----- 7 files changed, 54 insertions(+), 49 deletions(-) create mode 100644 .gitmodules create mode 100644 README.md create mode 160000 btcpayserver diff --git a/.gitignore b/.gitignore index 6c5156b..2dad42f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ data .env +btcpayserver \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..7631f06 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "btcpayserver"] + path = btcpayserver + url = https://github.com/lalanza808/btcpayserver diff --git a/Dockerfile b/Dockerfile index 6df9ab1..0cd2bb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM lalanza808/wownero:v0.11.3.0 RUN apt update && apt install curl -y -WORKDIR /data +WORKDIR /wallet + +EXPOSE 34568 COPY run_wallet.sh /run_wallet.sh diff --git a/README.md b/README.md new file mode 100644 index 0000000..64de0b2 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# BTCPayServer Wownero + diff --git a/btcpayserver b/btcpayserver new file mode 160000 index 0000000..7d15dd6 --- /dev/null +++ b/btcpayserver @@ -0,0 +1 @@ +Subproject commit 7d15dd6b9e59cec306130c765e9fea11c43bb5ee diff --git a/docker-compose.yaml b/docker-compose.yaml index c4af558..c3e1d76 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,77 +2,79 @@ services: btcpayserver: restart: unless-stopped - image: ${BTCPAY_IMAGE:-btcpayserver/btcpayserver:1.13.7-altcoins} + build: + context: btcpayserver container_name: btcpayserver expose: - - "49392" + - 49392 environment: BTCPAY_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Application Name=btcpayserver;Database=btcpayserver${NBITCOIN_NETWORK:-mainnet} BTCPAY_EXPLORERPOSTGRES: User ID=postgres;Host=postgres;Port=5432;Application Name=btcpayserver;MaxPoolSize=80;Database=nbxplorer${NBITCOIN_NETWORK:-mainnet} BTCPAY_NETWORK: ${NBITCOIN_NETWORK:-mainnet} BTCPAY_BIND: 0.0.0.0:49392 BTCPAY_ROOTPATH: ${BTCPAY_ROOTPATH:-/} - BTCPAY_SSHCONNECTION: "root@host.docker.internal" + BTCPAY_SSHCONNECTION: root@host.docker.internal BTCPAY_SSHTRUSTEDFINGERPRINTS: ${BTCPAY_SSHTRUSTEDFINGERPRINTS} BTCPAY_SSHKEYFILE: ${BTCPAY_SSHKEYFILE} BTCPAY_SSHAUTHORIZEDKEYS: ${BTCPAY_SSHAUTHORIZEDKEYS} BTCPAY_DEBUGLOG: btcpay.log - BTCPAY_UPDATEURL: https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest - BTCPAY_DOCKERDEPLOYMENT: "true" - BTCPAY_CHAINS: "xmr" - BTCPAY_XMR_DAEMON_URI: http://wownerod:34568 - BTCPAY_XMR_WALLET_DAEMON_URI: http://wownerod_wallet:8000 - BTCPAY_XMR_WALLET_DAEMON_WALLETDIR: /root/xmr_wallet + BTCPAY_UPDATEURLz: https://api.github.com/repos/btcpayserver/btcpayserver/releases/latest + BTCPAY_DOCKERDEPLOYMENT: true + BTCPAY_CHAINS: wow + BTCPAYGEN_CRYPTO1: xmr + BTCPAY_WOW_DAEMON_URI: http://wownerod:34568 + BTCPAY_WOW_WALLET_DAEMON_URI: http://wownerod_wallet:8000 + BTCPAY_WOW_WALLET_DAEMON_WALLETDIR: /wallet HIDDENSERVICE_NAME: BTCPayServer HIDDENSERVICE_REVERSEPROXY: nginx BTCPAY_TORRCFILE: /usr/local/etc/tor/torrc-2 BTCPAY_SOCKSENDPOINT: tor:9050 labels: - traefik.enable: "false" + traefik.enable: false traefik.http.routers.btcpayserver.rule: Host(`${BTCPAY_HOST}`) ports: - 127.0.0.1:49392:49392 links: - - postgres + - postgres volumes: - - "btcpay_datadir:/datadir" - - "nbxplorer_datadir:/root/.nbxplorer" - - "btcpay_pluginsdir:/root/.btcpayserver/Plugins" - - "./data:/root/xmr_wallet" - - "tor_servicesdir:/var/lib/tor/hidden_services" - - "tor_torrcdir:/usr/local/etc/tor/" + - btcpay_datadir:/datadir + - nbxplorer_datadir:/root/.nbxplorer + - btcpay_pluginsdir:/root/.btcpayserver/Plugins + - ./data/wallet:/wallet + - tor_servicesdir:/var/lib/tor/hidden_services + - tor_torrcdir:/usr/local/etc/tor/ wownerod: restart: unless-stopped build: context: . container_name: btcpayserver_wownerod - entrypoint: wownerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=34568 --non-interactive --block-notify="/usr/bin/curl -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=wow&hash=%s" --hide-my-port --enable-dns-blocklist + entrypoint: wownerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=34568 --non-interactive --block-notify="/usr/bin/curl -s -X GET http://btcpayserver:49392/wownerolikedaemoncallback/block?cryptoCode=wow&hash=%s" --hide-my-port --enable-dns-blocklist expose: - - "34568" + - 34568 volumes: - - "${DATA_PATH:-./data}:/root/.wownero" + - ${DATA_PATH:-./data/lmdb}:/root/.wownero - wownerod_wallet: + wallet: restart: unless-stopped build: context: . - container_name: btcpayserver_wownero_wallet + container_name: btcpayserver_wallet command: bash /run_wallet.sh "${WALLET_PASS:-walletpass}" "http://wownerod:34568" expose: - - "34568" + - 34568 volumes: - - "./data:/data" + - ./data/wallet:/wallet depends_on: - - wownerod + - wownerod nbxplorer: restart: unless-stopped image: nicolasdorier/nbxplorer:2.5.14 container_name: btcpayserver_nbxplorer expose: - - "32838" + - 32838 environment: NBXPLORER_NETWORK: ${NBITCOIN_NETWORK:-mainnet} NBXPLORER_BIND: 0.0.0.0:32838 @@ -80,9 +82,9 @@ services: NBXPLORER_SIGNALFILESDIR: /datadir NBXPLORER_POSTGRES: User ID=postgres;Host=postgres;Port=5432;Application Name=nbxplorer;MaxPoolSize=20;Database=nbxplorer${NBITCOIN_NETWORK:-mainnet} links: - - postgres + - postgres volumes: - - "nbxplorer_datadir:/datadir" + - nbxplorer_datadir:/datadir postgres: restart: unless-stopped @@ -93,7 +95,7 @@ services: environment: POSTGRES_HOST_AUTH_METHOD: trust volumes: - - "postgres_datadir:/var/lib/postgresql/data" + - postgres_datadir:/var/lib/postgresql/data tor: restart: unless-stopped @@ -105,29 +107,28 @@ services: TOR_EXTRA_ARGS: | CookieAuthentication 1 expose: - - "9050" - - "9051" + - 9050 + - 9051 volumes: - - "tor_datadir:/home/tor/.tor" - - "tor_torrcdir:/usr/local/etc/tor" - - "tor_servicesdir:/var/lib/tor/hidden_services" + - tor_datadir:/home/tor/.tor + - tor_torrcdir:/usr/local/etc/tor + - tor_servicesdir:/var/lib/tor/hidden_services tor-gen: restart: unless-stopped image: btcpayserver/docker-gen:0.10.7 container_name: btcpayserver_tor-gen volumes: - - "/var/run/docker.sock:/tmp/docker.sock:ro" - - "./torrc.tmpl:/etc/docker-gen/templates/torrc.tmpl:ro" - - "tor_torrcdir:/usr/local/etc/tor" + - /var/run/docker.sock:/tmp/docker.sock:ro + - ./torrc.tmpl:/etc/docker-gen/templates/torrc.tmpl:ro + - tor_torrcdir:/usr/local/etc/tor entrypoint: /usr/local/bin/docker-gen -notify-sighup tor -watch -wait 5s:30s /etc/docker-gen/templates/torrc.tmpl /usr/local/etc/tor/torrc-2 links: - - tor + - tor volumes: btcpay_datadir: btcpay_pluginsdir: - xmr_wallet: xmr_data: nbxplorer_datadir: postgres_datadir: diff --git a/run_wallet.sh b/run_wallet.sh index 3539bc3..a500921 100644 --- a/run_wallet.sh +++ b/run_wallet.sh @@ -1,20 +1,16 @@ #!/bin/bash + export WALLET_CREDS="${1}" export DAEMON_URI="${2}" -export WALLET_FILE="/data/wallet" -export PASSWORD_FILE="/data/password" - -sleep 2 +export WALLET_FILE="/wallet/wallet" +export PASSWORD_FILE="/wallet/password" -env -set -x # Create new wallet if it doesn't exist if [[ ! -f ${WALLET_FILE} ]]; then echo $WALLET_CREDS > ${PASSWORD_FILE} wownero-wallet-cli \ - --password "${WALLET_CREDS}" \ --generate-new-wallet ${WALLET_FILE} \ --daemon-address ${DAEMON_URI} \ --password-file ${PASSWORD_FILE} \ @@ -31,10 +27,9 @@ wownero-wallet-rpc \ --password-file ${PASSWORD_FILE} \ --rpc-bind-port 8000 \ --rpc-bind-ip 0.0.0.0 \ - --disable-rpc-login \ --confirm-external-bind \ --log-file ${WALLET_FILE}.rpc.log \ --log-level 0 \ --non-interactive \ --trusted-daemon \ - --tx-notify="/usr/bin/curl -X GET http://btcpayserver:49392/monerolikedaemoncallback/tx?cryptoCode=xmr&hash=%s" + --tx-notify="/usr/bin/curl -s -X GET http://btcpayserver:49392/wownerolikedaemoncallback/tx?cryptoCode=wow&hash=%s"