|
|
@ -84,8 +84,9 @@ void help() |
|
|
<< " --json-rpc-port Specify JSON-RPC server port (implies '-j', default: 8080)." << endl |
|
|
<< " --json-rpc-port Specify JSON-RPC server port (implies '-j', default: 8080)." << endl |
|
|
#endif |
|
|
#endif |
|
|
<< " -K,--kill-blockchain First kill the blockchain." << endl |
|
|
<< " -K,--kill-blockchain First kill the blockchain." << endl |
|
|
<< " -l,--listen <port> Listen on the given port for incoming connected (default: 30303)." << endl |
|
|
<< " --listen-ip <ip> Listen on the given IP for incoming connections (default: 0.0.0.0)." << endl |
|
|
<< " -L,--local-networking Use peers whose addresses are local." << endl |
|
|
<< " -l,--listen <port> Listen on the given port for incoming connections (default: 30303)." << endl |
|
|
|
|
|
<< " -u,--public-ip <ip> Force public ip to given (default; auto)." << endl |
|
|
<< " -m,--mining <on/off> Enable mining (default: off)" << endl |
|
|
<< " -m,--mining <on/off> Enable mining (default: off)" << endl |
|
|
<< " -n,--upnp <on/off> Use upnp for NAT (default: on)." << endl |
|
|
<< " -n,--upnp <on/off> Use upnp for NAT (default: on)." << endl |
|
|
<< " -o,--mode <full/peer> Start a full node or a peer node (Default: full)." << endl |
|
|
<< " -o,--mode <full/peer> Start a full node or a peer node (Default: full)." << endl |
|
|
@ -94,7 +95,6 @@ void help() |
|
|
<< " -r,--remote <host> Connect to remote host (default: none)." << endl |
|
|
<< " -r,--remote <host> Connect to remote host (default: none)." << endl |
|
|
<< " -s,--secret <secretkeyhex> Set the secret key for use with send command (default: auto)." << endl |
|
|
<< " -s,--secret <secretkeyhex> Set the secret key for use with send command (default: auto)." << endl |
|
|
<< " -t,--miners <number> Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl |
|
|
<< " -t,--miners <number> Number of mining threads to start (Default: " << thread::hardware_concurrency() << ")" << endl |
|
|
<< " -u,--public-ip <ip> Force public ip to given (default; auto)." << endl |
|
|
|
|
|
<< " -v,--verbosity <0..9> Set the log verbosity from 0 to 9 (tmp forced to 1)." << endl |
|
|
<< " -v,--verbosity <0..9> Set the log verbosity from 0 to 9 (tmp forced to 1)." << endl |
|
|
<< " -x,--peers <number> Attempt to connect to given number of peers (default: 5)." << endl |
|
|
<< " -x,--peers <number> Attempt to connect to given number of peers (default: 5)." << endl |
|
|
<< " -V,--version Show the version and exit." << endl |
|
|
<< " -V,--version Show the version and exit." << endl |
|
|
@ -321,7 +321,9 @@ enum class NodeMode |
|
|
|
|
|
|
|
|
int main(int argc, char** argv) |
|
|
int main(int argc, char** argv) |
|
|
{ |
|
|
{ |
|
|
|
|
|
string listenIP; |
|
|
unsigned short listenPort = 30303; |
|
|
unsigned short listenPort = 30303; |
|
|
|
|
|
string publicIP; |
|
|
string remoteHost; |
|
|
string remoteHost; |
|
|
unsigned short remotePort = 30303; |
|
|
unsigned short remotePort = 30303; |
|
|
string dbPath; |
|
|
string dbPath; |
|
|
@ -332,10 +334,8 @@ int main(int argc, char** argv) |
|
|
#if ETH_JSONRPC |
|
|
#if ETH_JSONRPC |
|
|
int jsonrpc = 8080; |
|
|
int jsonrpc = 8080; |
|
|
#endif |
|
|
#endif |
|
|
string publicIP; |
|
|
|
|
|
bool bootstrap = false; |
|
|
bool bootstrap = false; |
|
|
bool upnp = true; |
|
|
bool upnp = true; |
|
|
bool useLocal = false; |
|
|
|
|
|
bool forceMining = false; |
|
|
bool forceMining = false; |
|
|
bool killChain = false; |
|
|
bool killChain = false; |
|
|
bool jit = false; |
|
|
bool jit = false; |
|
|
@ -371,7 +371,9 @@ int main(int argc, char** argv) |
|
|
for (int i = 1; i < argc; ++i) |
|
|
for (int i = 1; i < argc; ++i) |
|
|
{ |
|
|
{ |
|
|
string arg = argv[i]; |
|
|
string arg = argv[i]; |
|
|
if ((arg == "-l" || arg == "--listen" || arg == "--listen-port") && i + 1 < argc) |
|
|
if (arg == "--listen-ip" && i + 1 < argc) |
|
|
|
|
|
listenIP = argv[++i]; |
|
|
|
|
|
else if ((arg == "-l" || arg == "--listen" || arg == "--listen-port") && i + 1 < argc) |
|
|
listenPort = (short)atoi(argv[++i]); |
|
|
listenPort = (short)atoi(argv[++i]); |
|
|
else if ((arg == "-u" || arg == "--public-ip" || arg == "--public") && i + 1 < argc) |
|
|
else if ((arg == "-u" || arg == "--public-ip" || arg == "--public") && i + 1 < argc) |
|
|
publicIP = argv[++i]; |
|
|
publicIP = argv[++i]; |
|
|
@ -392,8 +394,6 @@ int main(int argc, char** argv) |
|
|
return -1; |
|
|
return -1; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
else if (arg == "-L" || arg == "--local-networking") |
|
|
|
|
|
useLocal = true; |
|
|
|
|
|
else if (arg == "-K" || arg == "--kill-blockchain") |
|
|
else if (arg == "-K" || arg == "--kill-blockchain") |
|
|
killChain = true; |
|
|
killChain = true; |
|
|
else if ((arg == "-c" || arg == "--client-name") && i + 1 < argc) |
|
|
else if ((arg == "-c" || arg == "--client-name") && i + 1 < argc) |
|
|
@ -535,6 +535,8 @@ int main(int argc, char** argv) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!clientName.empty()) |
|
|
if (!clientName.empty()) |
|
|
clientName += "/"; |
|
|
clientName += "/"; |
|
|
|
|
|
|
|
|
@ -542,7 +544,7 @@ int main(int argc, char** argv) |
|
|
|
|
|
|
|
|
StructuredLogger::get().initialize(structuredLogging, structuredLoggingFormat); |
|
|
StructuredLogger::get().initialize(structuredLogging, structuredLoggingFormat); |
|
|
VMFactory::setKind(jit ? VMKind::JIT : VMKind::Interpreter); |
|
|
VMFactory::setKind(jit ? VMKind::JIT : VMKind::Interpreter); |
|
|
NetworkPreferences netPrefs(listenPort, publicIP, upnp, useLocal); |
|
|
NetworkPreferences netPrefs(publicIP, listenIP ,listenPort, upnp); |
|
|
auto nodesState = contents((dbPath.size() ? dbPath : getDataDir()) + "/network.rlp"); |
|
|
auto nodesState = contents((dbPath.size() ? dbPath : getDataDir()) + "/network.rlp"); |
|
|
std::string clientImplString = "NEthereum(++)/" + clientName + "v" + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) + (jit ? "/JIT" : ""); |
|
|
std::string clientImplString = "NEthereum(++)/" + clientName + "v" + dev::Version + "/" DEV_QUOTED(ETH_BUILD_TYPE) "/" DEV_QUOTED(ETH_BUILD_PLATFORM) + (jit ? "/JIT" : ""); |
|
|
dev::WebThreeDirect web3( |
|
|
dev::WebThreeDirect web3( |
|
|
@ -687,7 +689,9 @@ int main(int argc, char** argv) |
|
|
{ |
|
|
{ |
|
|
unsigned port; |
|
|
unsigned port; |
|
|
iss >> port; |
|
|
iss >> port; |
|
|
web3.setNetworkPreferences(NetworkPreferences((short)port, publicIP, upnp)); |
|
|
if (port) |
|
|
|
|
|
netPrefs.listenPort = port; |
|
|
|
|
|
web3.setNetworkPreferences(netPrefs); |
|
|
web3.startNetwork(); |
|
|
web3.startNetwork(); |
|
|
} |
|
|
} |
|
|
else if (cmd == "connect") |
|
|
else if (cmd == "connect") |
|
|
|
subtly
10 years ago