Bump versions, add p2pool step

.env

@@ -15,18 +15,18 @@ MONEROD_ZMQ_PUB_PORT=18083
 MONEROD_EXTRA_PARAMS=
 MONEROD_accessControlAllowOriginList=*
 
-LWS_TAG=0.17-15bce7f
+LWS_TAG=v0.2_0.18
 LWS_PORT=8000
 LWS_EXTRA_PARAMS=
 
 #TOR_TAG=latest
-TOR_TAG=0.4.7.7
+TOR_TAG=v0.4.7.8-57f8867
 TOR_HTTP_PORT=80
 
-EXPLORER_TAG=v0.17
+EXPLORER_TAG=v0.18
 EXPLORER_PORT=8081
 
-P2POOL_WALLET=
+P2POOL_WALLET=changeme
 P2POOL_STRATUM_PORT=3333
 P2POOL_P2P_PORT=37889
 P2POOL_PEERS=65.21.227.114:37889,node.sethforprivacy.com:37889

docker-compose.yml

@@ -45,7 +45,7 @@ x-monerod-command: &monerod-command
 x-tor-service: &tor-service
   tor:
     container_name: tor
-    image: vdo1138/tor-hidden-service:${TOR_TAG}
+    image: goldy/tor-hidden-service:${TOR_TAG}
     restart: unless-stopped
     links:
       - monerod
@@ -84,14 +84,14 @@ x-monero-lws-service: &monero-lws-service
     image: vdo1138/monero-lws:${LWS_TAG}
     container_name: monero-lws
     restart: unless-stopped
+    security_opt:
+      - "no-new-privileges:true"
     command: >-
       --rest-server http://0.0.0.0:8000 --daemon=tcp://monerod:${MONEROD_ZMQ_RPC_PORT}
       --sub=tcp://monerod:${MONEROD_ZMQ_PUB_PORT} --log-level=4
       --confirm-external-bind ${LWS_EXTRA_PARAMS}
     volumes:
       - ./data/monero-lws:/home/monero-lws/.bitmonero/
-    # ports:
-    #   - ${LWS_PORT}
     depends_on:
       - monerod
     labels:
@@ -132,7 +132,7 @@ x-p2pool-service: &p2pool-service
     command: >-
       --wallet "${P2POOL_WALLET}"
       --stratum "0.0.0.0:${P2POOL_STRATUM_PORT}" --p2p "0.0.0.0:${P2POOL_P2P_PORT}" --rpc-port "${MONEROD_RPC_PORT}"
-      --addpeers "P2POOL_PEERS" --host "monerod"
+      --addpeers "P2POOL_PEERS" --host "monerod" --no-randomx
 
 x-grafana-service: &grafana-service
   grafana:

install

@@ -319,6 +319,28 @@ configure_lws() {
     done
 }
 
+configure_p2pool() {
+    echo -e "${OkBullet}Configuring p2pool..."
+    while true; do
+        read -r -e -p "   Do you want to enable the p2pool service? [y/n]: " yn
+        case $yn in
+        [Yy]*)
+            read -r -e -p "   Enter the desired primary address which will recieve the rewards. []: " P2P_ADDRESS
+            while ! echo "${P2P_ADDRESS}" | grep -qP '(4|5|9|A)[a-zA-Z|\d]{94}'; do
+                echo -e "${WarnBullet}Address is not valid. Remember: subaddresses are not supported by p2pool."
+                read -r -p "   Enter again your primary address: " P2P_ADDRESS
+            done
+            sed -i "s/P2POOL_WALLET=.*/P2POOL_WALLET=${P2P_ADDRESS}/g" .env
+            sed -i '/#!p2pool/s/# //g' docker-compose.yml
+            ENABLE_P2POOL=true
+            break
+            ;;
+        [Nn]*) break ;;
+        *) echo "   Please answer yes or no." ;;
+        esac
+    done
+}
+
 configure_grafana() {
     echo -e "${OkBullet}Configuring grafana..."
     while true; do
@@ -409,6 +431,9 @@ completed() {
     if [ "$ENABLE_LWS" = true ]; then
         echo -e " ${Red}│${Stat} LWS URL: ${StatInfo}https://${HOST}${PORT_SUFF}/lws"
     fi
+    if [ "$ENABLE_P2POOL" = true ]; then
+        echo -e " ${Red}│${Stat} P2Pool stratum: ${StatInfo}${HOST}:3333"
+    fi
     if [ "$ENABLE_GRAFANA" = true ]; then
         echo -e " ${Red}│${Stat} Grafana URL: ${StatInfo}https://${HOST}${PORT_SUFF}/grafana"
         echo -e " ${Red}│${Stat} Grafana user: ${StatInfo}admin"
@@ -444,7 +469,7 @@ configure_cors
 configure_tor
 configure_lws
 # Deployment of explorer disabled until it's stable.
-# configure_explorer
+configure_explorer
 configure_grafana
 configure_watchtower