diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index d71ead0..681093c 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 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 + 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 }} --out-peers 200 --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 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 + 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 }} --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 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 + 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 }} --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 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 + ./p2pool-salvium --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --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 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 + p2pool-salvium.exe --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --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 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 + ./p2pool-salvium.exe --host core2.whiskymine.io --rpc-port 19081 --zmq-port 19084 --wallet SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp ${{ secrets.MM_PARAMS }} --out-peers 200 --data-api data --local-api --loglevel 6 - name: Check p2pool.log run: | diff --git a/src/side_chain.cpp b/src/side_chain.cpp index 86848c2..c0cabe1 100644 --- a/src/side_chain.cpp +++ b/src/side_chain.cpp @@ -50,7 +50,7 @@ LOG_CATEGORY(SideChain) -static constexpr uint64_t MIN_DIFFICULTY = 100000; +static constexpr uint64_t MIN_DIFFICULTY = 10000; static constexpr size_t UNCLE_BLOCK_DEPTH = 3; static_assert(1 <= UNCLE_BLOCK_DEPTH && UNCLE_BLOCK_DEPTH <= 10, "Invalid UNCLE_BLOCK_DEPTH"); @@ -132,9 +132,17 @@ SideChain::SideChain(p2pool* pool, NetworkType type, const char* pool_name, cons // Format: network_type\0pool_name\0password\0block_time\0min_diff\0window_size\0uncle_penalty\0 // Note: Network type is serialized as "mainnet"/"testnet"/"stagenet" by log::Stream::Entry - constexpr char default_config[] = "mainnet\0" "salvium_main\0" "\0" "10\0" "100000\0" "2160\0" "20\0"; - constexpr char mini_config[] = "mainnet\0" "salvium_mini\0" "\0" "10\0" "100000\0" "2160\0" "20\0"; - constexpr char nano_config[] = "mainnet\0" "salvium_nano\0" "\0" "30\0" "100000\0" "2160\0" "10\0"; + constexpr char default_config[] = "mainnet\0" "salvium_main\0" "\0" "10\0" "10000\0" "2160\0" "20\0"; + constexpr char mini_config[] = "mainnet\0" "salvium_mini\0" "\0" "10\0" "10000\0" "2160\0" "20\0"; + constexpr char nano_config[] = "mainnet\0" "salvium_nano\0" "\0" "30\0" "10000\0" "2160\0" "10\0"; + + // Debug: print buffer contents + fprintf(stderr, "DEBUG consensus: s.m_pos=%zu, sizeof(default_config)-1=%zu\n", s.m_pos, sizeof(default_config) - 1); + fprintf(stderr, "DEBUG buf hex: "); + for (size_t i = 0; i < s.m_pos && i < 60; ++i) { + fprintf(stderr, "%02x ", static_cast(buf[i])); + } + fprintf(stderr, "\n"); // Hardcoded default consensus ID if ((s.m_pos == sizeof(default_config) - 1) && (memcmp(buf, default_config, sizeof(default_config) - 1) == 0)) { @@ -149,6 +157,7 @@ SideChain::SideChain(p2pool* pool, NetworkType type, const char* pool_name, cons m_consensusId.assign(nano_consensus_id, nano_consensus_id + HASH_SIZE); } else { + fprintf(stderr, "DEBUG: No config match, falling through to RandomX\n"); #ifdef WITH_RANDOMX const randomx_flags flags = randomx_get_flags(); randomx_cache* cache = randomx_alloc_cache(flags | RANDOMX_FLAG_LARGE_PAGES);