Commit Graph

1055 Commits

Author SHA1 Message Date
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
ThomasV 0e7e7e3dc5 Merge branch 'local_tx' 2018-01-30 00:18:44 +01:00
SomberNight 704bdedea1 tx heights: replace magic numbers with named constants 2018-01-29 23:04:12 +01:00
SomberNight 2dca7bd39c subtle typo 2018-01-29 17:42:39 +01:00
SomberNight 8a71e46e9b fix conflicting local txns, e.g. when using RBF 2018-01-29 15:39:46 +01:00
Johann Bauer 8676e870f3 Raise exception if transaction is not related to wallet 2018-01-28 22:56:33 +01:00
SomberNight f0e7ae20f2 fix #3790 2018-01-28 22:20:27 +01:00
SomberNight c811c5c9d9 allow encrypting watch-only wallets. initial support for hw wallet storage encryption. 2018-01-28 02:09:44 +01:00
SomberNight d1e2ca4bc5 make wallet.is_change faster 2018-01-27 18:16:31 +01:00
SomberNight 1c67cfe01b optimise wallet.is_mine 2018-01-27 17:51:24 +01:00
SomberNight 7f3b627aa4 make wallet.get_address_index faster by storing an addr->index dict 2018-01-27 17:33:26 +01:00
SomberNight d09138446f fix wallet.check_history 2018-01-27 04:24:15 +01:00
Johann Bauer fbcee9a6f6 Also remove child transactions 2018-01-24 19:34:23 +01:00
Johann Bauer 887e06eebb Set icon for offline transactions 2018-01-23 23:50:02 +01:00
ThomasV e6dd3e6ad8 allow to save unbroadcasted transactions in wallet 2018-01-18 11:56:21 +01:00
SomberNight a20a3f9714 fix: sweeping into same wallet 2018-01-17 01:46:00 +01:00
SomberNight 7033125186 fee ui - rounding: display info icon with tooltip. show pre-rounding values in ui. 2018-01-03 18:08:10 +01:00
Andrew Chow 0a83b3af22 Avoid modifying self.transactions in prepare_for_verifier
In python3, the `.keys()` function returns an iterator, not a list,
so to get a list that can be iterated over, use `list()` instead to
avoid modification of a list while in use.
2018-01-01 18:03:00 -05:00
SomberNight 6c2b974796 change default relay fee to 1000 sat/kbyte 2017-12-31 05:06:52 +01:00
SomberNight 6f954090e6 fix fee ui: offline case 2017-12-30 01:13:36 +01:00
SomberNight e2c05c2400 RBF/sweep: use BIP_LI01_sort() 2017-12-22 02:33:22 +01:00
ThomasV f3a6491df4
Merge pull request #3575 from SomberNight/fix_imported_wallet_addr_filters
fix: address filters for Imported_Wallet: wallet.is_used()
2017-12-21 12:16:31 +01:00
SomberNight 3ba864bbca connect fee edits together 2017-12-21 11:17:20 +01:00
SomberNight 32b248245e fix: address filters for Imported_Wallet: wallet.is_used() 2017-12-21 03:22:21 +01:00
SomberNight ec99304ae1 fix sweeping for 2fa wallets 2017-12-11 17:37:10 +01:00