Merge branch 'master' of github.com:ucoin-io/ucoin

bin/ucoind

@@ -37,17 +37,27 @@ const NO_LOGS = true;
 program
   .version(pjson.version)
   .usage('<command> [options]')
-  .option('-p, --port <port>',         'Port to listen for requests', parseInt)
-  .option('-c, --currency <name>',     'Name of the currency managed by this node.')
+
   .option('-d, --mdb <name>',          'Database name (defaults to "ucoin_default").')
-  .option('--salt <salt>',             'Key salt to generate this key\'s secret key')
-  .option('--passwd <password>',       'Password to generate this key\'s secret key')
+
+  .option('--autoconf',                'With `init` command, will guess the best network and key options witout aksing for confirmation')
   .option('--ipv4 <address>',          'IPv4 interface to listen for requests')
   .option('--ipv6 <address>',          'IPv6 interface to listen for requests')
   .option('--remoteh <host>',          'Remote interface others may use to contact this node')
   .option('--remote4 <host>',          'Remote interface for IPv4 access')
   .option('--remote6 <host>',          'Remote interface for IPv6 access')
+  .option('-p, --port <port>',         'Port to listen for requests', parseInt)
   .option('--remotep <port>',          'Remote port others may use to contact this node')
+  .option('--upnp',                    'Use UPnP to open remote port')
+  .option('--noupnp',                  'Do not use UPnP to open remote port')
+
+  .option('--salt <salt>',             'Key salt to generate this key\'s secret key')
+  .option('--passwd <password>',       'Password to generate this key\'s secret key')
+  .option('--member',                  'With `bootstrap` command, ensures we have a member keypair')
+  .option('--participate <Y|N>',       'Participate to writing the blockchain')
+  .option('--cpu <percent>',           'Percent of CPU usage for proof-of-work computation', parsePercent)
+
+  .option('-c, --currency <name>',     'Name of the currency managed by this node.')
   .option('--sigDelay <timestamp>',    'Minimum delay between 2 similar certifications, in seconds.')
   .option('--sigValidity <timestamp>', 'Validity duration of a certification, in seconds.')
   .option('--msValidity <timestamp>',  'Validity duration of a memberships, in seconds.')
@@ -58,29 +68,25 @@ program
   .option('--powZeroMin <number>',     'Minimum number of leading zeros for a proof-of-work')
   .option('--powPeriod <number>',      'Number of blocks to wait to decrease proof-of-work difficulty by one')
   .option('--powDelay <number>',       'Number of seconds to wait before starting the computation of next block')
-  .option('--participate <Y|N>',       'Participate to writing the blockchain')
-  .option('--upnp',                    'Use UPnP to open remote port')
-  .option('--noupnp',                  'Do not use UPnP to open remote port')
   .option('--growth <number>',         'Universal Dividend %growth. Aka. \'c\' parameter in RTM', parsePercent)
   .option('--ud0 <number>',            'Universal Dividend initial value')
   .option('--dt <number>',             'Number of seconds between two UD')
   .option('--udid2',                   'Enable udid2 format for user id')
   .option('--rootoffset <number>',     'Allow to give a time offset for first block (offset in the past)')
-  .option('--cpu <percent>',           'Percent of CPU usage for proof-of-work computation', parsePercent)
-  .option('--timeout <milliseconds>',  'Timeout to use when contacting peers', parseInt)
   .option('--show',                    'With gen-next or gen-root commands, displays the generated block')
-  .option('--member',                  'With `bootstrap` command, ensures we have a member keypair')
-  .option('--httplogs',                'Enable HTTP logs')
-  .option('--nohttplogs',              'Disable HTTP logs')
+
   .option('--nointeractive',           'Disable interactive sync UI')
   .option('--nocautious',              'Do not check blocks validity during sync')
   .option('--cautious',                'Check blocks validity during sync (overrides --nocautious option)')
   .option('--nopeers',                 'Do not retrieve peers during sync')
+
+  .option('--timeout <milliseconds>',  'Timeout to use when contacting peers', parseInt)
+  .option('--httplogs',                'Enable HTTP logs')
+  .option('--nohttplogs',              'Disable HTTP logs')
   .option('--isolate',                 'Avoid the node to send peering or status informations to the network')
   .option('--check',                   'With gen-next: just check validity of generated block')
   .option('--forksize <size>',         'Maximum size of fork window', parseInt)
   .option('--memory',                  'Memory mode')
-  .option('--autoconf',                'With `init` command, will guess the best network and key options witout aksing for confirmation')
   ;
 
 program