Commit Graph

1100 Commits

Author SHA1 Message Date
Jon Layton 0ca9fc8391 Merge remote-tracking branch 'up/master' into HEAD 2018-03-05 19:40:10 -06:00
SomberNight 81666bf9ac fix #4026 2018-03-05 11:44:03 +01:00
SomberNight 0df6d1ec97 trezor: segwit offline signing 2018-03-03 02:39:49 +01:00
ThomasV 4b7cf297f5 fix #3998 2018-03-02 18:00:05 +01:00
SomberNight 02f2e5c599 wallet.add_transaction: adding to spent_outpoints, out of order case 2018-03-02 07:56:17 +01:00
ThomasV 968862076f fix sign 2018-03-01 19:09:24 +01:00
ThomasV 4236adc552 fix date filtering 2018-02-28 09:50:28 +01:00
ThomasV a3554dc2b7 fix #3963 2018-02-27 16:00:56 +01:00
ThomasV 51630416fc fix expenditures sign 2018-02-27 15:26:39 +01:00
ThomasV 31edc419fa improve get_tx_status 2018-02-27 15:13:44 +01:00
ThomasV c50d758c3e rename "Local only" as "Local" 2018-02-27 12:17:02 +01:00
SomberNight 3daa8b018f prepare self.unverified_tx regardless of network 2018-02-26 19:45:20 +01:00
ThomasV 22daffbbea fix typo 2018-02-26 18:16:33 +01:00
ThomasV aad0e276c0 wallet history: compute income and expenditures, remove redundant calculation of acquisition price 2018-02-26 18:13:39 +01:00
SomberNight 649b5a7298 fix #3964 2018-02-24 22:37:03 +01:00
SomberNight f1b7578218 fix #3960 2018-02-24 00:30:40 +01:00
ThomasV 24054ac399
Merge pull request #3943 from SomberNight/fee_cleanup
clean up fees a bit
2018-02-23 10:11:20 +01:00
ThomasV 8329faf760 price_at_timestamp: minor fix 2018-02-23 09:11:25 +01:00
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
SomberNight 4ddda74dad clean up fees a bit 2018-02-21 03:22:26 +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