From 5b0ee8247a0531b2f630d7cf92d958cec621d7d9 Mon Sep 17 00:00:00 2001
From: Seth Simmons <40500387+sethsimmons@users.noreply.github.com>
Date: Fri, 18 Dec 2020 14:02:33 +0000
Subject: [PATCH] Pass ban-list to block malicious nodes (#413)

* Pass ban-list to block malicious nodes

This change requires https://github.com/btcpayserver/dockerfile-deps/pull/18 to be merged first, or else the Docker container will fail to start.

* Bump Monero version to v0.17.1.7

* Fix block.txt file location
---
 docker-compose-generator/docker-fragments/monero.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose-generator/docker-fragments/monero.yml b/docker-compose-generator/docker-fragments/monero.yml
index 9b6f461..d7f0f0f 100644
--- a/docker-compose-generator/docker-fragments/monero.yml
+++ b/docker-compose-generator/docker-fragments/monero.yml
@@ -4,8 +4,8 @@ services:
   monerod:
     restart: unless-stopped
     container_name: btcpayserver_monerod
-    image: btcpayserver/monero:0.17.1.6
-    entrypoint: monerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --non-interactive --block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --hide-my-port --prune-blockchain
+    image: btcpayserver/monero:0.17.1.7
+    entrypoint: monerod --rpc-bind-ip=0.0.0.0 --confirm-external-bind --rpc-bind-port=18081 --non-interactive --block-notify="/bin/sh ./scripts/notifier.sh -X GET http://btcpayserver:49392/monerolikedaemoncallback/block?cryptoCode=xmr&hash=%s" --hide-my-port --prune-blockchain --ban-list=/home/monero/block.txt
     expose:
       - "18081"
     volumes:
@@ -13,7 +13,7 @@ services:
   monerod_wallet:
     restart: unless-stopped
     container_name: btcpayserver_monero_wallet
-    image: btcpayserver/monero:0.17.1.6
+    image: btcpayserver/monero:0.17.1.7
     entrypoint: monero-wallet-rpc --rpc-bind-ip=0.0.0.0 --disable-rpc-login --confirm-external-bind --rpc-bind-port=18082 --non-interactive --trusted-daemon  --daemon-address=monerod:18081 --wallet-file=/wallet/wallet --password-file=/wallet/password --tx-notify="/bin/sh ./scripts/notifier.sh  -X GET http://btcpayserver:49392/monerolikedaemoncallback/tx?cryptoCode=xmr&hash=%s"
     expose:
       - "18082"