@ -121,8 +121,13 @@ void help()
< < " Usage eth [OPTIONS] " < < endl < < " Usage eth [OPTIONS] " < < endl
< < " Options: " < < endl < < endl < < " Options: " < < endl < < endl
< < " Client mode (default): " < < endl < < " Client mode (default): " < < endl
< < " --olympic Use the Olympic (0.9) protocol. " < < endl
< < " --frontier Use the Frontier (1.0) protocol. " < < endl
< < " --private <name> Use a private chain. " < < 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
# if ETH_JSCONSOLE || !ETH_TRUE
< < " -i,--interactive Enter interactive mode (default: non-interactive). " < < endl < < " -i,--interactive Enter interactive mode (default: non-interactive). " < < endl
# endif
# if ETH_JSONRPC || !ETH_TRUE # if ETH_JSONRPC || !ETH_TRUE
< < " -j,--json-rpc Enable JSON-RPC server (default: off). " < < endl < < " -j,--json-rpc Enable JSON-RPC server (default: off). " < < endl
< < " --json-rpc-port <n> Specify JSON-RPC server port (implies '-j', default: " < < SensibleHttpPort < < " ). " < < endl < < " --json-rpc-port <n> Specify JSON-RPC server port (implies '-j', default: " < < SensibleHttpPort < < " ). " < < endl
@ -139,7 +144,6 @@ void help()
< < " --master <password> Give the master password for the key store. " < < endl < < " --master <password> Give the master password for the key store. " < < endl
< < " --password <password> Give a password for a private key. " < < endl < < " --password <password> Give a password for a private key. " < < endl
< < " --sentinel <server> Set the sentinel for reporting bad blocks or chain issues. " < < endl < < " --sentinel <server> Set the sentinel for reporting bad blocks or chain issues. " < < endl
< < " --prime <n> Specify n as the 6 digit prime number to start Frontier. " < < endl
< < endl < < endl
< < " Client transacting: " < < endl < < " Client transacting: " < < endl
/*<< " -B,--block-fees <n> Set the block fee profit in the reference unit e.g. ¢ (default: 15)." << endl
/*<< " -B,--block-fees <n> Set the block fee profit in the reference unit e.g. ¢ (default: 15)." << endl
@ -168,10 +172,10 @@ void help()
< < " --listen <port> Listen on the given port for incoming connections (default: 30303). " < < endl < < " --listen <port> Listen on the given port for incoming connections (default: 30303). " < < endl
< < " -r,--remote <host>(:<port>) Connect to remote host (default: none). " < < endl < < " -r,--remote <host>(:<port>) Connect to remote host (default: none). " < < endl
< < " --port <port> Connect to remote port (default: 30303). " < < endl < < " --port <port> Connect to remote port (default: 30303). " < < endl
< < " --network-id <n> Only connect to other hosts with this network id (default:0) . " < < endl < < " --network-id <n> Only connect to other hosts with this network id. " < < endl
< < " --upnp <on/off> Use UPnP for NAT (default: on). " < < endl < < " --upnp <on/off> Use UPnP for NAT (default: on). " < < endl
< < " --no-discovery Disable Node discovery. (experimental) " < < endl < < " --no-discovery Disable Node discovery. " < < endl
< < " --pin Only connect to required (trusted) peers. (experimental) " < < endl < < " --pin Only connect to required (trusted) peers. " < < endl
// << " --require-peers <peers.json> List of required (trusted) peers. (experimental)" << endl
// << " --require-peers <peers.json> List of required (trusted) peers. (experimental)" << endl
< < endl ; < < endl ;
MinerCLI : : streamHelp ( cout ) ; MinerCLI : : streamHelp ( cout ) ;
@ -196,9 +200,6 @@ void help()
< < " -v,--verbosity <0 - 9> Set the log verbosity from 0 to 9 (default: 8). " < < endl < < " -v,--verbosity <0 - 9> Set the log verbosity from 0 to 9 (default: 8). " < < endl
< < " -V,--version Show the version and exit. " < < endl < < " -V,--version Show the version and exit. " < < endl
< < " -h,--help Show this help message and exit. " < < endl < < " -h,--help Show this help message and exit. " < < endl
# if ETH_JSCONSOLE || !ETH_TRUE
< < " --console Use interactive javascript console " < < endl
# endif
; ;
exit ( 0 ) ; exit ( 0 ) ;
} }
@ -1068,8 +1069,8 @@ int main(int argc, char** argv)
/// Operating mode.
/// Operating mode.
OperationMode mode = OperationMode : : Node ; OperationMode mode = OperationMode : : Node ;
string dbPath ; string dbPath ;
unsigned prime = 0 ; // unsigned prime = 0;
bool yesIReallyKnowWhatImDoing = false ; // bool yesIReallyKnowWhatImDoing = false;
/// File name for import/export.
/// File name for import/export.
string filename ; string filename ;
@ -1083,10 +1084,14 @@ int main(int argc, char** argv)
/// General params for Node operation
/// General params for Node operation
NodeMode nodeMode = NodeMode : : Full ; NodeMode nodeMode = NodeMode : : Full ;
bool interactive = false ; bool interactive = false ;
# if ETH_JSONRPC # if ETH_JSONRPC || !ETH_TRUE
int jsonrpc = - 1 ; int jsonrpc = - 1 ;
# endif # endif
string jsonAdmin ; string jsonAdmin ;
string genesisJSON ;
dev : : eth : : Network releaseNetwork = c_network ;
string privateChain ;
bool upnp = true ; bool upnp = true ;
WithExisting withExisting = WithExisting : : Trust ; WithExisting withExisting = WithExisting : : Trust ;
string sentinel ; string sentinel ;
@ -1192,7 +1197,7 @@ int main(int argc, char** argv)
mode = OperationMode : : Export ; mode = OperationMode : : Export ;
filename = argv [ + + i ] ; filename = argv [ + + i ] ;
} }
else if ( arg = = " --prime " & & i + 1 < argc ) /* else if (arg == "--prime" && i + 1 < argc)
try try
{ {
prime = stoi ( argv [ + + i ] ) ; prime = stoi ( argv [ + + i ] ) ;
@ -1204,7 +1209,7 @@ int main(int argc, char** argv)
} }
else if ( arg = = " --yes-i-really-know-what-im-doing " ) else if ( arg = = " --yes-i-really-know-what-im-doing " )
yesIReallyKnowWhatImDoing = true ; yesIReallyKnowWhatImDoing = true ;
else if ( arg = = " --sentinel " & & i + 1 < argc ) */ else if ( arg = = " --sentinel " & & i + 1 < argc )
sentinel = argv [ + + i ] ; sentinel = argv [ + + i ] ;
else if ( arg = = " --mine-on-wrong-chain " ) else if ( arg = = " --mine-on-wrong-chain " )
mineOnWrongChain = true ; mineOnWrongChain = true ;
@ -1253,6 +1258,15 @@ int main(int argc, char** argv)
cerr < < " Bad " < < arg < < " option: " < < argv [ i ] < < endl ; cerr < < " Bad " < < arg < < " option: " < < argv [ i ] < < endl ;
return - 1 ; return - 1 ;
} }
else if ( arg = = " --private " & & i + 1 < argc )
try {
privateChain = argv [ + + i ] ;
}
catch ( . . . )
{
cerr < < " Bad " < < arg < < " option: " < < argv [ i ] < < endl ;
return - 1 ;
}
else if ( arg = = " -K " | | arg = = " --kill-blockchain " | | arg = = " --kill " ) else if ( arg = = " -K " | | arg = = " --kill-blockchain " | | arg = = " --kill " )
withExisting = WithExisting : : Kill ; withExisting = WithExisting : : Kill ;
else if ( arg = = " -R " | | arg = = " --rebuild " ) else if ( arg = = " -R " | | arg = = " --rebuild " )
@ -1306,11 +1320,11 @@ int main(int argc, char** argv)
} }
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 = = " --genesis-nonce " & & i + 1 < argc ) else if ( arg = = " --genesis-json " & & i + 1 < argc )
{ {
try try
{ {
CanonBlockChain < Ethash > : : setGenesisNonce ( Nonce ( argv [ + + i ] ) ) ; genesisJSON = contentsString ( argv [ + + i ] ) ;
} }
catch ( . . . ) catch ( . . . )
{ {
@ -1318,6 +1332,10 @@ int main(int argc, char** argv)
return - 1 ; return - 1 ;
} }
} }
else if ( arg = = " --frontier " )
releaseNetwork = eth : : Network : : Frontier ;
else if ( arg = = " --olympic " )
releaseNetwork = eth : : Network : : Olympic ;
/* else if ((arg == "-B" || arg == "--block-fees") && i + 1 < argc)
/* else if ((arg == "-B" || arg == "--block-fees") && i + 1 < argc)
{ {
try try
@ -1412,9 +1430,9 @@ int main(int argc, char** argv)
pinning = true ; pinning = true ;
else if ( arg = = " -f " | | arg = = " --force-mining " ) else if ( arg = = " -f " | | arg = = " --force-mining " )
forceMining = true ; forceMining = true ;
else if ( arg = = " -i " | | arg = = " - -interactive " ) else if ( arg = = " --old -interactive " )
interactive = true ; interactive = true ;
# if ETH_JSONRPC # if ETH_JSONRPC || !ETH_TRUE
else if ( ( arg = = " -j " | | arg = = " --json-rpc " ) ) else if ( ( arg = = " -j " | | arg = = " --json-rpc " ) )
jsonrpc = jsonrpc = = - 1 ? SensibleHttpPort : jsonrpc ; jsonrpc = jsonrpc = = - 1 ? SensibleHttpPort : jsonrpc ;
else if ( arg = = " --json-rpc-port " & & i + 1 < argc ) else if ( arg = = " --json-rpc-port " & & i + 1 < argc )
@ -1422,8 +1440,8 @@ int main(int argc, char** argv)
else if ( arg = = " --json-admin " & & i + 1 < argc ) else if ( arg = = " --json-admin " & & i + 1 < argc )
jsonAdmin = argv [ + + i ] ; jsonAdmin = argv [ + + i ] ;
# endif # endif
# if ETH_JSCONSOLE # if ETH_JSCONSOLE || !ETH_TRUE
else if ( arg = = " --console " ) else if ( arg = = " -i " | | arg = = " --interactive " | | arg = = " - -console " )
useConsole = true ; useConsole = true ;
# endif # endif
else if ( ( arg = = " -v " | | arg = = " --verbosity " ) & & i + 1 < argc ) else if ( ( arg = = " -v " | | arg = = " --verbosity " ) & & i + 1 < argc )
@ -1471,6 +1489,13 @@ int main(int argc, char** argv)
} }
} }
// Set up all the chain config stuff.
resetNetwork ( releaseNetwork ) ;
if ( ! privateChain . empty ( ) )
CanonBlockChain < Ethash > : : forceGenesisExtraData ( sha3 ( privateChain ) . asBytes ( ) ) ;
if ( ! genesisJSON . empty ( ) )
CanonBlockChain < Ethash > : : setGenesis ( genesisJSON ) ;
if ( g_logVerbosity > 0 ) if ( g_logVerbosity > 0 )
{ {
cout < < EthGrayBold " (++)Ethereum " EthReset < < endl ; cout < < EthGrayBold " (++)Ethereum " EthReset < < endl ;
@ -1529,8 +1554,9 @@ int main(int argc, char** argv)
StructuredLogger : : get ( ) . initialize ( structuredLogging , structuredLoggingFormat , structuredLoggingURL ) ; StructuredLogger : : get ( ) . initialize ( structuredLogging , structuredLoggingFormat , structuredLoggingURL ) ;
auto netPrefs = publicIP . empty ( ) ? NetworkPreferences ( listenIP , listenPort , upnp ) : NetworkPreferences ( publicIP , listenIP , listenPort , upnp ) ; auto netPrefs = publicIP . empty ( ) ? NetworkPreferences ( listenIP , listenPort , upnp ) : NetworkPreferences ( publicIP , listenIP , listenPort , upnp ) ;
netPrefs . discovery = ! disableDiscovery ; netPrefs . discovery = privateChain . empty ( ) & & ! disableDiscovery ;
netPrefs . pin = pinning ; netPrefs . pin = pinning | | ! privateChain . empty ( ) ;
auto nodesState = contents ( ( dbPath . size ( ) ? dbPath : getDataDir ( ) ) + " /network.rlp " ) ; auto nodesState = contents ( ( dbPath . size ( ) ? dbPath : getDataDir ( ) ) + " /network.rlp " ) ;
dev : : WebThreeDirect web3 ( dev : : WebThreeDirect web3 (
WebThreeDirect : : composeClientVersion ( " ++eth " , clientName ) , WebThreeDirect : : composeClientVersion ( " ++eth " , clientName ) ,
@ -1632,7 +1658,7 @@ int main(int argc, char** argv)
cout < < imported < < " imported in " < < e < < " seconds at " < < ( round ( imported * 10 / e ) / 10 ) < < " blocks/s (# " < < web3 . ethereum ( ) - > number ( ) < < " ) " < < endl ; cout < < imported < < " imported in " < < e < < " seconds at " < < ( round ( imported * 10 / e ) / 10 ) < < " blocks/s (# " < < web3 . ethereum ( ) - > number ( ) < < " ) " < < endl ;
return 0 ; return 0 ;
} }
/*
if ( c_network = = eth : : Network : : Frontier & & ! yesIReallyKnowWhatImDoing ) if ( c_network = = eth : : Network : : Frontier & & ! yesIReallyKnowWhatImDoing )
{ {
auto pd = contents ( getDataDir ( ) + " primes " ) ; auto pd = contents ( getDataDir ( ) + " primes " ) ;
@ -1652,7 +1678,7 @@ int main(int argc, char** argv)
primes . insert ( prime ) ; primes . insert ( prime ) ;
writeFile ( getDataDir ( ) + " primes " , rlp ( primes ) ) ; writeFile ( getDataDir ( ) + " primes " , rlp ( primes ) ) ;
} }
*/
if ( keyManager . exists ( ) ) if ( keyManager . exists ( ) )
{ {
if ( masterPassword . empty ( ) | | ! keyManager . load ( masterPassword ) ) if ( masterPassword . empty ( ) | | ! keyManager . load ( masterPassword ) )
Paweł Bylica
10 years ago