Cleanup, compilation error fixes

src/i2p.cpp

@@ -16,12 +16,8 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdexcept>
-#include <curl/curl.h>
-#include <iostream>
-
+#include "common.h"
 #include "i2p.h"
-#include "log.h"
 
 LOG_CATEGORY(I2P)
 

src/main.cpp

@@ -64,7 +64,6 @@ void p2pool_usage()
 		"--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"
-		"--sam-port            I2P router SAM bridge port number, default is 7656\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"

src/p2p_server.cpp

@@ -66,7 +66,8 @@ static constexpr hash seed_onion_nodes[] = {
 };
 
 static constexpr hash seed_i2p_nodes[] = {
-	from_i2p_b32_const("mwrwtarc2x6ea2qrzo737nnxv2gg5mo5atk24f5omy3j74xtwkqa")
+	// TODO: add seed node address
+	from_i2p_b32_const("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.b32.i2p")
 };
 
 P2PServer::P2PServer(p2pool* pool)
@@ -1991,12 +1992,10 @@ void P2PServer::P2PClient::reset()
 			server->m_fastestPeer = nullptr;
 		}
 		if ((m_addressType == AddressType::DomainName) && m_connectedTime) {
-			if (m_addressType == AddressType::DomainName) {
-				if (server->m_isI2P == true) {
-					--server->m_numI2PConnections;
-				} else {
-					--server->m_numOnionConnections;
-				}
+			if (server->m_isI2P == true) {
+				--server->m_numI2PConnections;
+			} else {
+				--server->m_numOnionConnections;
 			}
 		}
 	}

src/params.cpp

@@ -479,11 +479,6 @@ bool Params::process_arg(const std::vector<std::string>& arg)
 		return true;
 	}
 
-	if ((arg[0] == "sam-port") && has1(arg)) {
-		m_samPort = static_cast<int32_t>(std::min(std::max(strtoul(arg[1].c_str(), nullptr, 10), 1UL), 65535UL));
-		return true;
-	}
-
 	if (arg[0] == "no-clearnet-p2p") {
 		m_noClearnetP2P = true;
 		return true;

src/params.h

@@ -155,8 +155,6 @@ struct Params
 	// Raw hash of the destination info; decoded Base32 address with suffix removed
 	hash m_i2pDestinationHash;
 
-	uint16_t m_samPort = 7656;
-
 	bool m_noClearnetP2P = false;
 	bool m_stratumProxyProtocol = false;
 	bool m_p2pProxyProtocol = false;