From 53026f9a538aeda889a5efa0e5c83715852709c9 Mon Sep 17 00:00:00 2001 From: Matt Hess Date: Sat, 20 Dec 2025 20:01:49 +0000 Subject: [PATCH] updated to use new zmq host w/ github fw rules to allow access --- .github/workflows/test-sync.yml | 14 +++++++------- src/p2pool.cpp | 6 ++++++ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index 8800cbc..d71ead0 100644 --- a/.github/workflows/test-sync.yml +++ b/.github/workflows/test-sync.yml @@ -65,7 +65,7 @@ jobs: python ../tests/src/stratum_dummy.py 2 & python ../tests/src/stratum_dummy.py 3 & sudo sysctl vm.mmap_rnd_bits=28 - TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1 history_size=4" ./p2pool-salvium --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 + TSAN_OPTIONS="suppressions=../tests/src/tsan_sup.txt halt_on_error=1 history_size=4" ./p2pool-salvium --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check synchronization run: | @@ -156,7 +156,7 @@ jobs: python ../tests/src/stratum_dummy.py 2 & python ../tests/src/stratum_dummy.py 3 & sudo sysctl vm.mmap_rnd_bits=28 - MSAN_OPTIONS="halt_on_error=1" ./p2pool-salvium --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --out-peers 50 --data-api data --local-api --loglevel 6 + MSAN_OPTIONS="halt_on_error=1" ./p2pool-salvium --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --out-peers 50 --data-api data --local-api --loglevel 6 - name: Check synchronization run: | @@ -209,7 +209,7 @@ jobs: python ../tests/src/stratum_dummy.py 2 & python ../tests/src/stratum_dummy.py 3 & sudo sysctl vm.mmap_rnd_bits=28 - UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool-salvium --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 + UBSAN_OPTIONS="suppressions=../tests/src/ubsan_sup.txt halt_on_error=1" ./p2pool-salvium --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check synchronization run: | @@ -262,7 +262,7 @@ jobs: python ../tests/src/stratum_dummy.py 2 & python ../tests/src/stratum_dummy.py 3 & sudo sysctl vm.mmap_rnd_bits=28 - ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool-salvium --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 + ASAN_OPTIONS="detect_stack_use_after_return=1 atexit=1" ./p2pool-salvium --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check synchronization run: | @@ -336,7 +336,7 @@ jobs: python3 ../tests/src/stratum_dummy.py 1 & python3 ../tests/src/stratum_dummy.py 2 & python3 ../tests/src/stratum_dummy.py 3 & - ./p2pool-salvium --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 + ./p2pool-salvium --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check synchronization run: | @@ -387,7 +387,7 @@ jobs: start python ../../tests/src/stratum_dummy.py 1 start python ../../tests/src/stratum_dummy.py 2 start python ../../tests/src/stratum_dummy.py 3 - p2pool-salvium.exe --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 + p2pool-salvium.exe --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check p2pool.log run: | @@ -431,7 +431,7 @@ jobs: Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 1" Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 2" Start-Process python -ArgumentList "../../tests/src/stratum_dummy.py 3" - ./p2pool-salvium.exe --host seed01.salvium.io --rpc-port 19081 --zmq-port 19084 --host seed02.salvium.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 + ./p2pool-salvium.exe --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --mini --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check p2pool.log run: | diff --git a/src/p2pool.cpp b/src/p2pool.cpp index d1d77b5..b26077b 100644 --- a/src/p2pool.cpp +++ b/src/p2pool.cpp @@ -1456,7 +1456,13 @@ void p2pool::download_block_headers4(uint64_t start_height, uint64_t current_hei } catch (const std::exception& e) { LOGERR(1, "Couldn't start ZMQ reader: exception " << e.what()); +#ifdef DEV_TEST_SYNC + // In test mode, allow p2pool to continue without ZMQ + // The reconnect logic will retry connecting to other hosts + LOGWARN(1, "Continuing without ZMQ reader in test mode"); +#else PANIC_STOP(); +#endif } } #endif