Skip to content
Snippets Groups Projects
Commit 40a2f13b authored by Moul's avatar Moul
Browse files

[enh] #78: use Scrypt as default authentication method:

- update help: Authentication section at the end.
parent eb651903
No related branches found
No related tags found
No related merge requests found
...@@ -9,15 +9,14 @@ from re import compile, search ...@@ -9,15 +9,14 @@ from re import compile, search
def auth_method(cli_args): def auth_method(cli_args):
if cli_args.contains_switches('auth-scrypt'):
return auth_by_scrypt(cli_args)
if cli_args.contains_switches('auth-seed'): if cli_args.contains_switches('auth-seed'):
return auth_by_seed() return auth_by_seed()
if cli_args.contains_switches('auth-file'): if cli_args.contains_switches('auth-file'):
return auth_by_auth_file(cli_args) return auth_by_auth_file(cli_args)
if cli_args.contains_switches('auth-wif'): if cli_args.contains_switches('auth-wif'):
return auth_by_wif() return auth_by_wif()
message_exit("Error: no authentication method") else:
return auth_by_scrypt(cli_args)
def generate_auth_file(cli_args): def generate_auth_file(cli_args):
......
...@@ -27,13 +27,10 @@ def usage(): ...@@ -27,13 +27,10 @@ def usage():
\n \ \n \
\n - amount: Get amount of accounts \ \n - amount: Get amount of accounts \
\n pubkeys and/or ids separated with colon: <pubkey:id:pubkey>\ \n pubkeys and/or ids separated with colon: <pubkey:id:pubkey>\
\n --auth-scrypt [script parameters -n <N> -r <r> -p <p>] (default: 4096,16,1)\ \n - authentication: see below section\
\n --auth-seed | --auth-file [--file=<path file>] | --auth-wif\
\n \ \n \
\n - tx/transaction: Send transaction\ \n - tx/transaction: Send transaction\
\n - authentication:\ \n - authentication: see below section\
\n --auth-scrypt [script parameters -n <N> -r <r> -p <p>] (default: 4096,16,1)\
\n --auth-seed | --auth-file [--file=<path file>] | --auth-wif\
\n - amount:\ \n - amount:\
\n --amountUD=<relative value> | --amount=<quantitative value>\ \n --amountUD=<relative value> | --amount=<quantitative value>\
\n [--allSources] \ \n [--allSources] \
...@@ -44,9 +41,7 @@ def usage(): ...@@ -44,9 +41,7 @@ def usage():
\n \ \n \
\n - cert: Send certification\ \n - cert: Send certification\
\n - e.g.: silkaj cert <id> <auth>\ \n - e.g.: silkaj cert <id> <auth>\
\n - authentication:\ \n - authentication: see below section\
\n --auth-scrypt [script parameters -n <N> -r <r> -p <p>] (default: 4096,16,1)\
\n --auth-seed | --auth-file [--file=<path file>] | --auth-wif\
\n \ \n \
\n - net/network: Display current network with many information \ \n - net/network: Display current network with many information \
\n [--discover] Discover all network (could take a while), optional \ \n [--discover] Discover all network (could take a while), optional \
...@@ -62,13 +57,20 @@ def usage(): ...@@ -62,13 +57,20 @@ def usage():
\n - argos: display currency information formated for Argos or BitBar\ \n - argos: display currency information formated for Argos or BitBar\
\n \ \n \
\n - generate_auth_file: Generate file to store the seed of the account\ \n - generate_auth_file: Generate file to store the seed of the account\
\n --auth-scrypt [script parameters -n <N> -r <r> -p <p>] (default: 4096,16,1)\ \n - authentication: see below section\
\n --auth-seed | --auth-file [--file=<path file>] | --auth-wif\
\n \ \n \
\n - id/identities <pubkey> or <identity>: get corresponding identity or pubkey from pubkey or identity.\ \n - id/identities <pubkey> or <identity>: get corresponding identity or pubkey from pubkey or identity.\
\n it could autocomplete the pubkey corresponding to an identity with three or four following characters.\ \n it could autocomplete the pubkey corresponding to an identity with three or four following characters.\
\n \ \n \
\n - wot <pubkey> or <identity>: display received and sent certifications for an account.") \n - wot <pubkey> or <identity>: display received and sent certifications for an account.\
\n\
\nAuthentication:\
\n for amount, transaction, certification, and generate_auth_file commands\
\n - Scrypt is the default authentication method with 4096,16,1 as default values\
\n you can specify others values specifying following parameters: -n <N> -r <r> -p <p>\
\n - Seed: --auth-seed\
\n - File: --auth-file [--file=<path file>]\
\n - WIF: --auth-wif")
def cli(): def cli():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment