diff --git a/src/silkaj.py b/src/silkaj.py index 4177d7bf28dd65bf3b7c7c6ef0593101ecd69bd0..99d5cdd7bc98e6f39183c16989a0f22393540038 100755 --- a/src/silkaj.py +++ b/src/silkaj.py @@ -39,9 +39,9 @@ def usage(): \n - amount:\ \n --amountUD=<relative value> | --amount=<quantitative value>\ \n [--allSources] \ - \n --output=<public key>[:checksum][,<public key>[:checksum]] \ + \n --output=<public key>[!checksum]:[<public key>[!checksum]] \ \n [--comment=<comment>] \ - \n [--outputBackChange=<public key[:checksum]>] \ + \n [--outputBackChange=<public key[!checksum]>] \ \n [-y | --yes], don't ask for prompt confirmation \ \n \ \n - cert: Send certification\ diff --git a/src/tools.py b/src/tools.py index 0e6376becb7e76486f0604eba05945ffcaa1ae89..7152c12a0c4c33684cd8416ae80d89f00a8b5a3e 100644 --- a/src/tools.py +++ b/src/tools.py @@ -52,11 +52,11 @@ def check_public_key(pubkey, display_error): """ regex = compile('^[1-9A-HJ-NP-Za-km-z]{43,44}$') regex_checksum = compile('^[1-9A-HJ-NP-Za-km-z]{43,44}' + - ':[1-9A-HJ-NP-Za-km-z]{3}$') + '![1-9A-HJ-NP-Za-km-z]{3}$') if search(regex, pubkey): return pubkey elif search(regex_checksum, pubkey): - pubkey, checksum = pubkey.split(":") + pubkey, checksum = pubkey.split("!") pubkey_byte = b58_decode(pubkey) checksum_calculed = b58_encode(hash.sha256( hash.sha256(pubkey_byte, encoding.RawEncoder), diff --git a/src/tx.py b/src/tx.py index 60c3c3904e9fdad7d2da0a0eab67b684f988a004..2f7a984f1c3501407cab77f4496fd486c4f03f91 100644 --- a/src/tx.py +++ b/src/tx.py @@ -24,7 +24,7 @@ def send_transaction(ep, cli_args): issuer_pubkey = get_publickey_from_seed(seed) pubkey_amount = get_amount_from_pubkey(ep, issuer_pubkey)[0] - outputAddresses = output.split(',') + outputAddresses = output.split(':') check_transaction_values(comment, outputAddresses, outputBackChange, pubkey_amount < amount * len(outputAddresses), issuer_pubkey) if cli_args.contains_switches('yes') or cli_args.contains_switches('y') or \