Commit Graph

1079 Commits

Author SHA1 Message Date
ThomasV f3440f5a20 fix 3954 2018-02-21 21:09:07 +01:00
ThomasV 99710099fb fix #3952 2018-02-21 20:57:45 +01:00
SomberNight 89e0f90e1f fix #3949 2018-02-21 16:45:34 +01:00
ThomasV 51f04d4e7b compute capital gains using wallet.txi and txo 2018-02-21 14:29:39 +01:00
ThomasV 9f7e256e39 cleanup get_full_history. fix #3939 2018-02-21 11:52:40 +01:00
ThomasV 1703e0036a
Merge pull request #3921 from SomberNight/fix_disabled_change_addrs
fix: disabling "use change addresses" did not work correctly
2018-02-21 11:18:59 +01:00
ThomasV 381de43cac
Merge pull request #3925 from SomberNight/wif_format_change
change WIF to "txin_type:old_wif"
2018-02-21 11:10:03 +01:00
SomberNight 6f5751977b local tx: restructure exception handling wrt wallet.add_transaction and QT 2018-02-21 04:04:27 +01:00
ThomasV d77e522721 fix #3912: Use Decimal('NaN') instead of None when exchange rate is not available. 2018-02-20 23:22:36 +01:00
SomberNight 7b3c454542 wallet.add_transaction should not return if tx has already been added. only track spent_outpoints for is_mine inputs. 2018-02-20 18:16:25 +01:00
ThomasV 0a1542e249 fix #3929 2018-02-20 09:58:36 +01:00
SomberNight 51c235a8be privkeys WIF: store in extended WIF internally; export as "txin_type:old_wif" 2018-02-19 20:42:53 +01:00
ThomasV 9110c0542c follow-up previous commit 2018-02-19 14:16:11 +01:00
ThomasV 826cf467d8 Improve wallet history tab:
- use json-serializable types
- add toolbar to history tab
- add button to display time interval
2018-02-19 12:42:27 +01:00
SomberNight 72a443b688 fix: disabling "use change addresses" did not work correctly 2018-02-18 20:13:27 +01:00
SomberNight 008bffcea7 undo verification when removing txn 2018-02-17 16:28:15 +01:00
SomberNight 0d758a650d follow-up 586074cb0f 2018-02-17 15:51:33 +01:00
ThomasV 586074cb0f simplify local transactions:
- restrict conflict detection own inputs
 - save local transactions only if they are own
2018-02-17 11:02:00 +01:00
SomberNight bd333f16e0 follow-up 76bf53b262 2018-02-16 15:17:55 +01:00
ThomasV 76bf53b262 simplify add_transaction 2018-02-16 13:54:18 +01:00
SomberNight 63e402c2d7 wallet.clear_history: clear txns and verified txns too 2018-02-16 13:37:38 +01:00
ThomasV 7ff32877f7 replace test that should never happen 2018-02-15 15:31:27 +01:00
ThomasV acbad0a005 change names 2018-02-14 14:25:51 +01:00
ThomasV 8bfe342772 minor fixes 2018-02-14 13:55:01 +01:00
ThomasV 0f16bcdc1f Capital gains:
* Show acquisition price in history.
* Add summary to history command
2018-02-14 12:04:47 +01:00
ThomasV e0130cafcf
Merge pull request #3895 from SomberNight/fix_3890
locking in wallet.create_new_address
2018-02-13 09:52:16 +01:00
ThomasV b3a67f7a1f Merge branch 'master' of github.com:spesmilo/electrum 2018-02-13 09:47:30 +01:00
ThomasV 2829de5d49 fix: missing parameter 2018-02-13 09:47:25 +01:00
SomberNight 7e77baf4fb fix #3890 2018-02-12 23:20:58 +01:00
SomberNight 2914090879 wallet.synchronize: remove dead code 2018-02-12 16:12:16 +01:00
ThomasV 4cbdd25c93 Capital gains: Let user enter fiat value of transactions. 2018-02-11 18:11:50 +01:00
ThomasV 0df42fe046 use Decimal for exchange rates 2018-02-10 15:03:45 +01:00
ThomasV 42a16d9c3e computation of capital gains for outgoing transactions 2018-02-09 20:43:42 +01:00
ThomasV c32435c15e
Merge pull request #3737 from SomberNight/fix_sweep_into_same_wallet
fix: sweeping into same wallet
2018-02-09 15:48:12 +01:00
ThomasV 3f954a8b3d Factorize history export code used in GUI and command line.
Add options to export history limits and exchange rate.
Closes: #1752, #2604,
Replaces: #2715, 3724
2018-02-09 15:28:28 +01:00
ThomasV d9cf4c2b63
Merge pull request #3810 from SomberNight/conflicting_txns
conflicting transactions
2018-02-06 06:16:19 +01:00
SomberNight ca19a36478 conflicting transactions 2018-02-06 05:39:40 +01:00
SomberNight d6c1a933fe some local txns are not getting SPV verified 2018-02-06 05:13:37 +01:00
SomberNight 245cd24f34 follow-up f39f43d58c 2018-02-05 20:15:00 +01:00
ThomasV f39f43d58c fix #3845 2018-02-05 16:08:57 +01:00
ThomasV c3f3843cc3 Add memory pool based fee estimates
- fee estimates can use ETA or mempool
 - require protocol version 1.2
 - remove fee_unit preference
2018-02-05 12:23:32 +01:00
SomberNight 0021dbfceb address filter: (qt gui) add "all" filter option besides "receiving" and "change" 2018-02-04 19:17:21 +01:00
SomberNight ffdc36285b use string.format instead of old style (%) formatting 2018-02-04 07:26:55 +01:00
ThomasV c49335ed30
Merge pull request #3346 from SomberNight/encrypt_watch_only_wallets
allow encrypting watch-only wallets
2018-02-03 11:02:14 +01:00
SomberNight 48e8bbff69 Revert "fix conflicting local txns, e.g. when using RBF"
This reverts commit 8a71e46e9b.
2018-01-31 16:48:09 +01:00
ThomasV acf473f7f2
Merge pull request #3777 from SomberNight/fix_wallet_check_history
fix wallet.check_history
2018-01-30 01:08:04 +01:00
ThomasV 64127a8bee
Merge pull request #3782 from SomberNight/opt_wallet_get_address_index
Optimisations in wallet.py
2018-01-30 01:06:44 +01:00
SomberNight ac69f628fe clean-up wallet.get_address_index 2018-01-30 00:59:12 +01:00
SomberNight d92a6d46eb wallet.is_mine: use inheritance for more readable code 2018-01-30 00:44:40 +01:00
ThomasV 2343894e0f Merge branch 'local_tx' 2018-01-30 00:22:02 +01:00