diff --git a/src/commands.py b/src/commands.py index 2cc5ec7345f773d0beac9d1a1ec5795ce6538443..d777753cee4fce896c68b83aba2bcfe795f427e6 100644 --- a/src/commands.py +++ b/src/commands.py @@ -218,21 +218,28 @@ def list_issuers(ep, nbr, last): def cmd_amount(ep, c): - if c.contains_definitions('pubkey'): - pubkey = c.get_definition('pubkey') - pubkey = check_public_key(pubkey, True) - if not pubkey: - return + if c.contains_definitions("pubkeys"): + pubkeys = c.get_definition("pubkeys").split(":") + for pubkey in pubkeys: + pubkey = check_public_key(pubkey, True) + if not pubkey: + return + total = [0, 0] + for pubkey in pubkeys: + value = get_amount_from_pubkey(ep, pubkey) + show_amount_from_pubkey(ep, pubkey, value) + total[0] += value[0] + total[1] += value[1] + if (len(pubkeys) > 1): + show_amount_from_pubkey(ep, "Total", total) else: seed = auth_method(c) pubkey = get_publickey_from_seed(seed) + show_amount_from_pubkey(ep, pubkey, get_amount_from_pubkey(ep, pubkey)) - show_amount_from_pubkey(ep, pubkey) +def show_amount_from_pubkey(ep, pubkey, value): -def show_amount_from_pubkey(ep, pubkey): - - value = get_amount_from_pubkey(ep, pubkey) totalAmountInput = value[0] amount = value[1] # output diff --git a/src/silkaj.py b/src/silkaj.py index 711f0fbfc2caa7278d80205e4e7bfc02c293d536..59d207d00c31f1cbc24632b785c96861afeee29b 100755 --- a/src/silkaj.py +++ b/src/silkaj.py @@ -19,8 +19,8 @@ def usage(): \nCommands: \ \n - info: Display information about currency \ \n \ - \n - amount: Get amount of one account \ - \n --pubkey=<pubkey[:checksum]>\ + \n - amount: Get amount of accounts \ + \n --pubkeys=<pubkey:pubkey:pubkey>\ \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 \