diff --git a/eth/main.cpp b/eth/main.cpp index 68f1da726..5076637d3 100644 --- a/eth/main.cpp +++ b/eth/main.cpp @@ -83,20 +83,20 @@ void help() << " --olympic Use the Olympic (0.9) protocol." << endl << " --frontier Use the Frontier (1.0) protocol." << endl << " --private Use a private chain." << endl - << " --genesis-json Import the genesis block information from the given json file." << endl + << " --genesis-json Import the genesis block information from the given JSON file." << endl << endl << " -o,--mode Start a full node or a peer node (default: full)." << endl << endl #if ETH_JSONRPC || !ETH_TRUE << " -j,--json-rpc Enable JSON-RPC server (default: off)." << endl << " --json-rpc-port Specify JSON-RPC server port (implies '-j', default: " << SensibleHttpPort << ")." << endl - << " --admin Specify admin session key for JSON-RPC (default: auto-generated and printed at startup)." << endl + << " --admin Specify admin session key for JSON-RPC (default: auto-generated and printed at start-up)." << endl #endif - << " -K,--kill First kill the blockchain." << endl + << " -K,--kill Kill the blockchain first." << endl << " -R,--rebuild Rebuild the blockchain from the existing database." << endl << " --rescue Attempt to rescue a corrupt database." << endl << endl - << " --import-presale Import a presale key; you'll need to type the password to this." << endl + << " --import-presale Import a pre-sale key; you'll need to specify the password to this key." << endl << " -s,--import-secret Import a secret key into the key store and use as the default." << endl << " -S,--import-session-secret Import a secret key into the key store and use as the default for this session only." << endl << " --sign-key
Sign all transactions with the key of the given address." << endl @@ -106,74 +106,74 @@ void help() << " --sentinel Set the sentinel for reporting bad blocks or chain issues." << endl << endl << "Client transacting:" << endl - /*<< " -B,--block-fees Set the block fee profit in the reference unit e.g. ¢ (default: 15)." << endl - << " -e,--ether-price Set the ether price in the reference unit e.g. ¢ (default: 30.679)." << endl - << " -P,--priority <0 - 100> Default % priority of a transaction (default: 50)." << endl*/ - << " --ask Set the minimum ask gas price under which no transactions will be mined (default " << toString(c_defaultGasPrice) << " )." << endl - << " --bid Set the bid gas price for to pay for transactions (default " << toString(c_defaultGasPrice) << " )." << endl + /*<< " -B,--block-fees Set the block fee profit in the reference unit, e.g. ¢ (default: 15)." << endl + << " -e,--ether-price Set the ether price in the reference unit, e.g. ¢ (default: 30.679)." << endl + << " -P,--priority <0 - 100> Set the default priority percentage (%) of a transaction (default: 50)." << endl*/ + << " --ask Set the minimum ask gas price under which no transaction will be mined (default " << toString(c_defaultGasPrice) << " )." << endl + << " --bid Set the bid gas price to pay for transactions (default " << toString(c_defaultGasPrice) << " )." << endl << endl << "Client mining:" << endl - << " -a,--address Set the coinbase (mining payout) address to addr (default: auto)." << endl - << " -m,--mining Enable mining, optionally for a specified number of blocks (default: off)" << endl - << " -f,--force-mining Mine even when there are no transactions to mine (default: off)" << endl - << " --mine-on-wrong-chain Mine even when we know it's the wrong chain (default: off)" << endl + << " -a,--address Set the coinbase (mining payout) address to given address (default: auto)." << endl + << " -m,--mining Enable mining, optionally for a specified number of blocks (default: off)." << endl + << " -f,--force-mining Mine even when there are no transactions to mine (default: off)." << endl + << " --mine-on-wrong-chain Mine even when we know that it is the wrong chain (default: off)." << endl << " -C,--cpu When mining, use the CPU." << endl - << " -G,--opencl When mining use the GPU via OpenCL." << endl - << " --opencl-platform When mining using -G/--opencl use OpenCL platform n (default: 0)." << endl - << " --opencl-device When mining using -G/--opencl use OpenCL device n (default: 0)." << endl - << " -t, --mining-threads Limit number of CPU/GPU miners to n (default: use everything available on selected platform)" << endl + << " -G,--opencl When mining, use the GPU via OpenCL." << endl + << " --opencl-platform When mining using -G/--opencl, use OpenCL platform n (default: 0)." << endl + << " --opencl-device When mining using -G/--opencl, use OpenCL device n (default: 0)." << endl + << " -t, --mining-threads Limit number of CPU/GPU miners to n (default: use everything available on selected platform)." << endl << endl << "Client networking:" << endl << " --client-name Add a name to your client's version string (default: blank)." << endl - << " --bootstrap Connect to the default Ethereum peerservers (default unless --no-discovery used)." << endl - << " --no-bootstrap Do not connect to the default Ethereum peerservers (default only when --no-discovery is used)." << endl - << " -x,--peers Attempt to connect to given number of peers (default: 11)." << endl - << " --peer-stretch Accepted connection multiplier (default: 7)." << endl + << " --bootstrap Connect to the default Ethereum peer servers (default unless --no-discovery used)." << endl + << " --no-bootstrap Do not connect to the default Ethereum peer servers (default only when --no-discovery is used)." << endl + << " -x,--peers Attempt to connect to a given number of peers (default: 11)." << endl + << " --peer-stretch Give the accepted connection multiplier (default: 7)." << endl - << " --public-ip Force advertised public ip to given (default: auto)." << endl + << " --public-ip Force advertised public IP to the given IP (default: auto)." << endl << " --listen-ip (:) Listen on the given IP for incoming connections (default: 0.0.0.0)." << endl << " --listen Listen on the given port for incoming connections (default: 30303)." << endl - << " -r,--remote (:) Connect to remote host (default: none)." << endl - << " --port Connect to remote port (default: 30303)." << endl - << " --network-id Only connect to other hosts with this network id." << endl + << " -r,--remote (:) Connect to the given remote host (default: none)." << endl + << " --port Connect to the given remote port (default: 30303)." << endl + << " --network-id Only connect to other hosts with this network id." << endl << " --upnp Use UPnP for NAT (default: on)." << endl - << " --peerset Space delimited list of type type:publickey@ipAddress[:port]" << endl + << " --peerset Space delimited list of peers; element format: type:publickey@ipAddress[:port]." << endl << " Types:" << endl - << " default Attempt connection when no other peers are available and pinning is disable." << endl + << " default Attempt connection when no other peers are available and pinning is disabled." << endl << " require Keep connected at all times." << endl // TODO: // << " --trust-peers Space delimited list of publickeys." << endl - << " --no-discovery Disable Node discovery, implies --no-bootstrap." << endl + << " --no-discovery Disable node discovery, implies --no-bootstrap." << endl << " --pin Only accept or connect to trusted peers." << endl << " --hermit Equivalent to --no-discovery --pin." << endl - << " --sociable Forces discovery and no pinning." << endl + << " --sociable Force discovery and no pinning." << endl << endl; MinerCLI::streamHelp(cout); cout << "Client structured logging:" << endl - << " --structured-logging Enable structured logging (default output to stdout)." << endl + << " --structured-logging Enable structured logging (default: output to stdout)." << endl << " --structured-logging-format Set the structured logging time format." << endl << " --structured-logging-url Set the structured logging destination (currently only file:// supported)." << endl << endl << "Import/export modes:" << endl - << " --from Export only from block n; n may be a decimal, a '0x' prefixed hash, or 'latest'." << endl - << " --to Export only to block n (inclusive); n may be a decimal, a '0x' prefixed hash, or 'latest'." << endl + << " --from Export only from block n; n may be a decimal, a '0x' pre-fixed hash, or 'latest'." << endl + << " --to Export only to block n (inclusive); n may be a decimal, a '0x' pre-fixed hash, or 'latest'." << endl << " --only Equivalent to --export-from n --export-to n." << endl - << " --dont-check Avoids checking some of the aspects of blocks. Faster importing, but only do if you know the data is valid." << endl + << " --dont-check Prevent checking some block aspects. Faster importing, but to apply only when the data is known to be valid." << endl << endl << "General Options:" << endl - << " -d,--db-path Load database from path (default: " << getDataDir() << ")" << endl + << " -d,--db-path Load database from path (default: " << getDataDir() << ")." << endl #if ETH_EVMJIT || !ETH_TRUE - << " --vm Select VM. Options are: interpreter, jit, smart. (default: interpreter)" << endl + << " --vm Select VM; options are: interpreter, jit or smart (default: interpreter)." << endl #endif << " -v,--verbosity <0 - 9> Set the log verbosity from 0 to 9 (default: 8)." << endl << " -V,--version Show the version and exit." << endl << " -h,--help Show this help message and exit." << endl << endl << "Experimental / Proof of Concept:" << endl - << " --shh Enable Whisper" << endl + << " --shh Enable Whisper." << endl << endl ; exit(0);