tAdd a help group for config variables. Change name of ssl variables - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ab60da89ac3c2541173057a96a6a9ab7d8f2fe0e
DIR parent 34360bddfb4f6d02d764dfa29fe3560e97535088
HTML Author: ThomasV <thomasv@gitorious>
Date: Wed, 3 Jun 2015 11:34:52 +0200
Add a help group for config variables. Change name of ssl variables
Diffstat:
M lib/commands.py | 33 ++++++++++++++++++++++---------
M lib/wallet.py | 4 ++--
2 files changed, 26 insertions(+), 11 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -542,7 +542,7 @@ class Commands:
a, b = r
url = url.replace(a, b)
URI = 'bitcoin:?r=' + url
- out['url'] = URI
+ out['URI'] = URI
if show_status:
status = self.wallet.get_request_status(addr, amount, timestamp, expiration)
out['status'] = pr_str[status]
t@@ -554,19 +554,15 @@ class Commands:
return map(lambda x: self._format_request(x, status), self.wallet.receive_requests.values())
@command('w')
- def addrequest(self, amount, reason='', expiration=60*60):
- """Create a payment request. If 'requests_dir' is set in your
- configuration, a bip70 file will be written to that
- directory. If you also set 'ssl_key_path' and 'ssl_cert_path',
- the request will be signed with your certificate. Note that
- the ssl_key_path file must contain the chain of certificates
- up to a root CA."""
+ def addrequest(self, requested_amount, reason='', expiration=60*60):
+ """Create a payment request.
+ """
amount = int(Decimal(amount)*COIN)
key = self.wallet.add_payment_request(self.config, amount, reason, expiration)
return self._format_request(self.wallet.get_payment_request(key)) if key else False
@command('w')
- def removerequest(self, address):
+ def rmrequest(self, address):
"""Remove a payment request"""
return self.wallet.remove_payment_request(address)
t@@ -584,6 +580,7 @@ param_descriptions = {
'message': 'Clear text message. Use quotes if it contains spaces.',
'encrypted': 'Encrypted message',
'amount': 'Amount to be sent (in BTC). Type \'!\' to send the maximum available.',
+ 'requested_amount': 'Requested amount (in BTC).',
'csv_file': 'CSV file of recipient, amount',
}
t@@ -627,6 +624,17 @@ arg_types = {
'amount': lambda x: Decimal(x) if x!='!' else '!',
}
+config_variables = {
+
+ 'addrequest': {
+ 'requests_dir': 'directory where a bip70 file will be written.',
+ 'ssl_privkey': 'Path to your SSL private key, needed to sign the request.',
+ 'ssl_chain': 'Chain of SSL certificates, needed for signed requests. Put your certificate at the top and the root CA at the end',
+ },
+ 'listrequests':{
+ 'url_rewrite': 'Parameters passed to str.replace(), in order to create the r= part of bitcoin: URIs. Example: \"(\'file:///var/www/\',\'https://electrum.org/\')\"',
+ }
+}
def set_default_subparser(self, name, args=None):
"""see http://stackoverflow.com/questions/5176691/argparse-how-to-specify-a-default-subcommand"""
t@@ -709,6 +717,13 @@ def get_parser(run_gui, run_daemon, run_cmdline):
h = param_descriptions.get(param, '')
_type = arg_types.get(param, str)
p.add_argument(param, help=h, type=_type)
+
+ cvh = config_variables.get(cmdname)
+ if cvh:
+ group = p.add_argument_group('configuration variables', '(set with setconfig/getconfig)')
+ for k, v in cvh.items():
+ group.add_argument(k, nargs='?', help=v)
+
# 'gui' is the default command
parser.set_default_subparser('gui')
return parser
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1241,8 +1241,8 @@ class Abstract_Wallet(object):
message = self.labels.get(addr, '')
script = Transaction.pay_script('address', addr).decode('hex')
outputs = [(script, amount)]
- key_path = config.get('ssl_key_path')
- cert_path = config.get('ssl_cert_path')
+ key_path = config.get('ssl_privkey')
+ cert_path = config.get('ssl_chain')
return make_payment_request(outputs, message, time, time + expiration, key_path, cert_path)
def get_payment_request(self, key):