|
@ -44,6 +44,7 @@ |
|
|
#include <libweb3jsonrpc/WebThreeStubServer.h> |
|
|
#include <libweb3jsonrpc/WebThreeStubServer.h> |
|
|
#include <jsonrpccpp/server/connectors/httpserver.h> |
|
|
#include <jsonrpccpp/server/connectors/httpserver.h> |
|
|
#endif |
|
|
#endif |
|
|
|
|
|
#include <libethcore/Ethasher.h> |
|
|
#include "BuildInfo.h" |
|
|
#include "BuildInfo.h" |
|
|
using namespace std; |
|
|
using namespace std; |
|
|
using namespace dev; |
|
|
using namespace dev; |
|
@ -112,6 +113,7 @@ void help() |
|
|
<< " -c,--client-name <name> Add a name to your client's version string (default: blank)." << endl |
|
|
<< " -c,--client-name <name> Add a name to your client's version string (default: blank)." << endl |
|
|
<< " -d,--db-path <path> Load database from path (default: ~/.ethereum " << endl |
|
|
<< " -d,--db-path <path> Load database from path (default: ~/.ethereum " << endl |
|
|
<< " <APPDATA>/Etherum or Library/Application Support/Ethereum)." << endl |
|
|
<< " <APPDATA>/Etherum or Library/Application Support/Ethereum)." << endl |
|
|
|
|
|
<< " -D,--initdag Initialize DAG for mining and exit." << endl |
|
|
<< " -e,--ether-price <n> Set the ether price in the reference unit e.g. ¢ (Default: 30.679)." << endl |
|
|
<< " -e,--ether-price <n> Set the ether price in the reference unit e.g. ¢ (Default: 30.679)." << endl |
|
|
<< " -f,--force-mining Mine even when there are no transaction to mine (Default: off)" << endl |
|
|
<< " -f,--force-mining Mine even when there are no transaction to mine (Default: off)" << endl |
|
|
<< " -h,--help Show this help message and exit." << endl |
|
|
<< " -h,--help Show this help message and exit." << endl |
|
@ -200,6 +202,7 @@ enum class NodeMode |
|
|
|
|
|
|
|
|
int main(int argc, char** argv) |
|
|
int main(int argc, char** argv) |
|
|
{ |
|
|
{ |
|
|
|
|
|
bool initDAG = false; |
|
|
string listenIP; |
|
|
string listenIP; |
|
|
unsigned short listenPort = 30303; |
|
|
unsigned short listenPort = 30303; |
|
|
string publicIP; |
|
|
string publicIP; |
|
@ -304,6 +307,8 @@ int main(int argc, char** argv) |
|
|
structuredLogging = true; |
|
|
structuredLogging = true; |
|
|
else if ((arg == "-d" || arg == "--path" || arg == "--db-path") && i + 1 < argc) |
|
|
else if ((arg == "-d" || arg == "--path" || arg == "--db-path") && i + 1 < argc) |
|
|
dbPath = argv[++i]; |
|
|
dbPath = argv[++i]; |
|
|
|
|
|
else if (arg == "-D" || arg == "--initdag") |
|
|
|
|
|
initDAG = true; |
|
|
else if ((arg == "-B" || arg == "--block-fees") && i + 1 < argc) |
|
|
else if ((arg == "-B" || arg == "--block-fees") && i + 1 < argc) |
|
|
{ |
|
|
{ |
|
|
try |
|
|
try |
|
@ -436,6 +441,14 @@ int main(int argc, char** argv) |
|
|
&nodesState, |
|
|
&nodesState, |
|
|
miners |
|
|
miners |
|
|
); |
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
if (initDAG) |
|
|
|
|
|
{ |
|
|
|
|
|
cout << "Initializing DAG. (This will take awhile)" << endl; |
|
|
|
|
|
Ethasher::get()->full(web3.ethereum()->blockChain().info()); |
|
|
|
|
|
return 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
web3.setIdealPeerCount(peers); |
|
|
web3.setIdealPeerCount(peers); |
|
|
std::shared_ptr<eth::BasicGasPricer> gasPricer = make_shared<eth::BasicGasPricer>(u256(double(ether / 1000) / etherPrice), u256(blockFees * 1000)); |
|
|
std::shared_ptr<eth::BasicGasPricer> gasPricer = make_shared<eth::BasicGasPricer>(u256(double(ether / 1000) / etherPrice), u256(blockFees * 1000)); |
|
|
eth::Client* c = mode == NodeMode::Full ? web3.ethereum() : nullptr; |
|
|
eth::Client* c = mode == NodeMode::Full ? web3.ethereum() : nullptr; |
|
|