trequire network to show request status - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 1fbbd5d65ddca3193ef2842def983ba1df380e53
DIR parent cbcb799eec9d4d992269ed7f6808e821a3e8ff0a
HTML Author: ThomasV <thomasv@gitorious>
Date: Fri, 12 Jun 2015 09:58:29 +0200
require network to show request status
Diffstat:
M lib/commands.py | 11 ++++++-----
M lib/wallet.py | 11 +++++++----
2 files changed, 13 insertions(+), 9 deletions(-)
---
DIR diff --git a/lib/commands.py b/lib/commands.py
t@@ -542,7 +542,7 @@ class Commands:
# """<Not implemented>"""
# pass
- @command('w')
+ @command('wn')
def listrequests(self, pending=False, expired=False, paid=False):
"""List the payment requests you made."""
out = self.wallet.get_sorted_requests(self.config)
t@@ -688,10 +688,11 @@ from util import profiler
def get_parser(run_gui, run_daemon, run_cmdline):
# parent parser, because set_default_subparser removes global options
parent_parser = argparse.ArgumentParser('parent', add_help=False)
- parent_parser.add_argument("-v", "--verbose", action="store_true", dest="verbose", default=False, help="Show debugging information")
- parent_parser.add_argument("-P", "--portable", action="store_true", dest="portable", default=False, help="Use local 'electrum_data' directory")
- parent_parser.add_argument("-w", "--wallet", dest="wallet_path", help="wallet path")
- parent_parser.add_argument("-o", "--offline", action="store_true", dest="offline", default=False, help="Run offline")
+ group = parent_parser.add_argument_group('global options')
+ group.add_argument("-v", "--verbose", action="store_true", dest="verbose", default=False, help="Show debugging information")
+ group.add_argument("-P", "--portable", action="store_true", dest="portable", default=False, help="Use local 'electrum_data' directory")
+ group.add_argument("-w", "--wallet", dest="wallet_path", help="wallet path")
+ group.add_argument("-o", "--offline", action="store_true", dest="offline", default=False, help="Run offline")
# create main parser
parser = argparse.ArgumentParser(
parents=[parent_parser],
DIR diff --git a/lib/wallet.py b/lib/wallet.py
t@@ -1261,10 +1261,13 @@ class Abstract_Wallet(object):
timestamp = r.get('timestamp', 0)
expiration = r.get('expiration')
if amount:
- paid = amount <= self.get_addr_received(address)
- status = PR_PAID if paid else PR_UNPAID
- if status == PR_UNPAID and expiration is not None and time.time() > timestamp + expiration:
- status = PR_EXPIRED
+ if self.up_to_date:
+ paid = amount <= self.get_addr_received(address)
+ status = PR_PAID if paid else PR_UNPAID
+ if status == PR_UNPAID and expiration is not None and time.time() > timestamp + expiration:
+ status = PR_EXPIRED
+ else:
+ status = PR_UNKNOWN
else:
status = PR_UNKNOWN
return status