From 2259d3df3467c93c00cccf6e611cef25f549efca Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Thu, 21 Jun 2018 18:12:34 +0200
Subject: [PATCH] [mod] #83, #72: keep constancy with amount cmd, using ':' as
pubkeys separator
---
src/silkaj.py | 4 ++--
src/tools.py | 4 ++--
src/tx.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/silkaj.py b/src/silkaj.py
index 4177d7bf..99d5cdd7 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 0e6376be..7152c12a 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 60c3c390..2f7a984f 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 \
--
GitLab