treason->memo - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 572a4638062ee8fc020fee3e6d99f0edffed2ce6
DIR parent f02c2fde64139e555c14070fd4bb86c2322d00c7
HTML Author: ThomasV <thomasv@gitorious>
Date: Mon, 8 Jun 2015 08:06:38 +0200
reason->memo
Diffstat:
M gui/qt/main_window.py | 2 +-
M lib/commands.py | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
---
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -812,7 +812,7 @@ class ElectrumWindow(QMainWindow):
timestamp = req['time']
amount = req.get('amount')
expiration = req.get('expiration', None)
- message = req.get('reason', '')
+ message = req.get('memo', '')
date = format_time(timestamp)
status = req.get('status')
account = self.wallet.get_account_name(self.wallet.get_account_from_address(address))
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -535,7 +535,7 @@ class Commands:
'address': addr,
'amount': format_satoshis(amount),
'timestamp': timestamp,
- 'reason': v.get('reason'),
+ 'memo': v.get('memo', ''),
'expiration': expiration,
'URI':'bitcoin:' + addr + '?amount=' + format_satoshis(amount),
'status': pr_str[v.get('status', PR_UNKNOWN)]
t@@ -574,10 +574,10 @@ class Commands:
return map(self._format_request, self.wallet.get_sorted_requests())
@command('w')
- def addrequest(self, requested_amount, reason='', expiration=60*60):
+ def addrequest(self, requested_amount, memo='', expiration=60*60):
"""Create a payment request."""
amount = int(Decimal(requested_amount)*COIN)
- key = self.wallet.add_payment_request(amount, reason, expiration)
+ key = self.wallet.add_payment_request(amount, memo, expiration)
if key is None:
return
req = self.wallet.get_payment_request(key)
t@@ -637,7 +637,7 @@ command_options = {
'unsigned': ("-u", "--unsigned", "Do not sign transaction"),
'domain': ("-D", "--domain", "List of addresses"),
'account': (None, "--account", "Account"),
- 'reason': (None, "--reason", "Description of the request"),
+ 'memo': ("-m", "--memo", "Description of the request"),
'expiration': (None, "--expiration", "Time in seconds"),
'status': (None, "--status", "Show status"),
}