bugfixes

src/main.cpp

@@ -27,9 +27,9 @@ void p2pool_usage()
 	printf("P2Pool %s\n"
 		"\nUsage:\n\n" \
 		"--wallet             Wallet address to mine to. Subaddresses and integrated addresses are not supported!\n"
-		"--host               IP address of your Wownero node, default is 127.0.0.1\n"
-		"--rpc-port           wownerod RPC API port number, default is 34568\n"
-		"--zmq-port           wownerod ZMQ pub port number, default is 34569 (same port as in wownerod's \"--zmq-pub\" command line parameter)\n"
+		"--host               IP address of your Monero node, default is 127.0.0.1\n"
+		"--rpc-port           monerod RPC API port number, default is 18081\n"
+		"--zmq-port           monerod ZMQ pub port number, default is 18083 (same port as in monerod's \"--zmq-pub\" command line parameter)\n"
 		"--stratum            Comma-separated list of IP:port for stratum server to listen on\n"
 		"--p2p                Comma-separated list of IP:port for p2p server to listen on\n"
 		"--addpeers           Comma-separated list of IP:port of other p2pool nodes to connect to\n"
@@ -41,22 +41,20 @@ void p2pool_usage()
 		"--stratum-api        An alias for --local-api\n"
 		"--no-cache           Disable p2pool.cache\n"
 		"--no-color           Disable colors in console output\n"
-		"--no-randomx         Disable internal RandomX hasher: p2pool will use RPC calls to wownerod to check PoW hashes\n"
+		"--no-randomx         Disable internal RandomX hasher: p2pool will use RPC calls to monerod to check PoW hashes\n"
 		"--out-peers N        Maximum number of outgoing connections for p2p server (any value between 10 and 450)\n"
 		"--in-peers N         Maximum number of incoming connections for p2p server (any value between 10 and 450)\n"
 		"--start-mining N     Start built-in miner using N threads (any value between 1 and 64)\n"
 		"--no-autodiff        Disable automatic difficulty adjustment for miners connected to stratum\n"
-		"--rpc-login          Specify username[:password] required for Wownero RPC server\n"
+		"--rpc-login          Specify username[:password] required for Monero RPC server\n"
 		"--socks5             Specify IP:port of a SOCKS5 proxy to use for outgoing connections\n"
 		"--no-dns             disable DNS queries, use only IP addresses to connect to peers (seed node DNS will be unavailable too)\n"
 		"--p2p-external-port  port number that your router uses for mapping to your local p2p port. Use it if you are behind a NAT and still want to accept incoming connections\n"
 		"--help               Show this help message\n\n"
 		"Example command line:\n\n"
-		"%s --host 127.0.0.1 --rpc-port 34568 --zmq-port 34569 --wallet YOUR_WALLET_ADDRESS --stratum 0.0.0.0:%d --p2p 0.0.0.0:%d\n\n",
+		"%s --host 127.0.0.1 --rpc-port 18081 --zmq-port 18083 --wallet YOUR_WALLET_ADDRESS --stratum 0.0.0.0:%d --p2p 0.0.0.0:%d\n\n",
 		p2pool::VERSION,
 		p2pool::log::MAX_GLOBAL_LOG_LEVEL,
-		p2pool::DEFAULT_P2P_PORT,
-		p2pool::DEFAULT_P2P_PORT_MINI,
 #ifdef _WIN32
 		"p2pool.exe"
 #else

src/side_chain.cpp

@@ -2086,25 +2086,23 @@ void SideChain::launch_precalc(const PoolBlock* block)
 		return;
 	}
 
-	for (int h = UNCLE_BLOCK_DEPTH - 1; h >= 0; --h) {
-		auto it = m_blocksByHeight.find(block->m_sidechainHeight + m_chainWindowSize + h - 1);
-		if (it == m_blocksByHeight.end()) {
-			continue;
+	auto it = m_blocksByHeight.find(block->m_sidechainHeight + m_chainWindowSize - 1);
+	if (it == m_blocksByHeight.end()) {
+		return;
+	}
+	for (PoolBlock* b : it->second) {
+		if (b->m_precalculated) {
+			return;
 		}
-		for (PoolBlock* b : it->second) {
-			if (b->m_precalculated) {
-				continue;
-			}
-			std::vector<MinerShare> shares;
-			if (get_shares(b, shares, nullptr, true)) {
-				b->m_precalculated = true;
-				PrecalcJob* job = new PrecalcJob{ b, std::move(shares) };
-				{
-					MutexLock lock2(m_precalcJobsMutex);
-					m_precalcJobs.push_back(job);
-				}
-				uv_cond_signal(&m_precalcJobsCond);
+		std::vector<MinerShare> shares;
+		if (get_shares(b, shares, nullptr, true)) {
+			b->m_precalculated = true;
+			PrecalcJob* job = new PrecalcJob{ b, std::move(shares) };
+			{
+				MutexLock lock2(m_precalcJobsMutex);
+				m_precalcJobs.push_back(job);
 			}
+			uv_cond_signal(&m_precalcJobsCond);
 		}
 	}
 }