RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,807 Commits 17 Branches 118 Tags 33 MiB
774b6ca30d
Commit Graph

3874 Commits

Author SHA1 Message Date
SomberNight
2fdbfa6b81 wizard: rename option to "use a master key" 2018-03-05 12:58:03 +01:00
脇山P
122cb08dc6 Add JPY exchange rate (#4016) 2018-03-05 12:08:10 +01:00
SomberNight
81666bf9ac fix #4026 2018-03-05 11:44:03 +01:00
ThomasV
0bca97dd2f improve fee status message 2018-03-05 09:49:17 +01:00
SomberNight
219ea6588b update default server list 2018-03-05 06:00:24 +01:00
SomberNight
81b6d65764 refactor network constants 2018-03-04 22:10:59 +01:00
ThomasV
1526768cd6 kivy: simplify history screen, display either fiat or btc 2018-03-03 11:32:38 +01:00
SomberNight
0df6d1ec97 trezor: segwit offline signing 2018-03-03 02:39:49 +01:00
SomberNight
7816edc342 fix #4003 2018-03-03 00:05:57 +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
9f5c76bf0b
Merge pull request #3995 from SomberNight/toggle_history_tab_capgains 
toggle capital gains columns in qt history tab
 2018-03-02 06:52:27 +01:00
ThomasV
968862076f fix sign 2018-03-01 19:09:24 +01:00
SomberNight
724ed874aa toggle capital gains columns in qt history tab 2018-03-01 19:05:51 +01:00
ThomasV
37e43d9c10 follow up prev commit 2018-03-01 18:31:16 +01:00
ThomasV
fb761b7c12 request fee historgam every minute. show fee in the send tab of kivy gui 2018-03-01 18:28:54 +01:00
ThomasV
4236adc552 fix date filtering 2018-02-28 09:50:28 +01:00
SomberNight
a821a3504e wizard: remove unused strings 2018-02-27 16:52: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
afd39b2f42 Merge branch 'master' of github.com:spesmilo/electrum 2018-02-27 12:19:54 +01:00
ThomasV
c50d758c3e rename "Local only" as "Local" 2018-02-27 12:17:02 +01:00
Yuki Inoue
6687c1b336 daemon returns true only if the wallet is loaded 2018-02-27 18:43:00 +09:00
ThomasV
375d7965d7
Merge pull request #3978 from SomberNight/load_unverified_tx_offline 
prepare self.unverified_tx regardless of network
 2018-02-27 00:52:24 +01:00
ThomasV
03b40a3c0a
Merge pull request #3514 from SomberNight/2fa_testnet 
make 2fa wallets work on testnet
 2018-02-27 00:50:09 +01:00
SomberNight
3daa8b018f prepare self.unverified_tx regardless of network 2018-02-26 19:45:20 +01:00
SomberNight
a32d27b9d7 make 2fa wallets work on testnet 2018-02-26 18:21:36 +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
ThomasV
9fe24e32c0 test for NaN in Fiat.__str__ 2018-02-26 18:04:44 +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
SomberNight
55a0a6b7f0 fix #3962 2018-02-24 00:14:34 +01:00
ThomasV
050f9b7d3a
Merge branch 'master' into zbar_windows 2018-02-23 16:04:34 +01:00
ThomasV
0fbcb8229b
Merge pull request #3882 from SomberNight/storage_hw_encrypt_cli_support 
cli support for hw encrypted wallets
 2018-02-23 12:07:08 +01:00
ThomasV
18ba4319da
Merge pull request #3951 from SomberNight/file_import_export_unification 
File import-export unification
 2018-02-23 11:46:04 +01:00
ThomasV
aaf89d2325 fix #3858 2018-02-23 11:30:59 +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
d38a50b119 fix #3922: wrong parameter passed to connection_down 2018-02-23 09:35:07 +01:00
ThomasV
8329faf760 price_at_timestamp: minor fix 2018-02-23 09:11:25 +01:00
SomberNight
151aa9d135 fix prev; offset is relative to last forking height 2018-02-22 16:59:37 +01:00
SomberNight
02c7524d75 logging: some extra network-related lines 2018-02-22 16:44:22 +01:00
ThomasV
0928ac961a fix #3955: fix interference between verifier and catch_up 2018-02-22 16:33:39 +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
500c0493d0 clean up prev commit 2018-02-21 19:22:07 +01:00
ThomasV
b7b592fd6e fix #3948 2018-02-21 19:04:33 +01:00
Abdussamad
5997c18aef better code organization 
function parameters should be lowercase

Fix crash on invalid labels import

Added invoice exporting and reduced duplicate code

Better exception handling

removed json module import

some more cleanup

Cleaned up some stuff

Added exporting contacts
 2018-02-21 19:00:41 +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
26d09b4915 fix timestamp of data in get_historical_rates 2018-02-20 10:52:11 +01:00
ThomasV
0a1542e249 fix #3929 2018-02-20 09:58:36 +01:00
ThomasV
395f9c9679
Merge pull request #3898 from SomberNight/bip32_versions_testnet 
bip32 version numbers (xpub headers): use t/u/U/v/V for testnet
 2018-02-20 09:53:01 +01:00
SomberNight
7a4338ea21 fix tests 2018-02-19 21:16:12 +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
SomberNight
945ba8decf fix #3912 2018-02-16 13:20:56 +01:00
SomberNight
fe1e412f01 catch some exceptions during GUI init 2018-02-15 17:30:40 +01:00
ThomasV
7ff32877f7 replace test that should never happen 2018-02-15 15:31:27 +01:00
ThomasV
344b5e0a23
Merge pull request #3901 from SomberNight/fix_3899 
fix #3899; and more aggressively catch exceptions in tx.deserialize()
 2018-02-15 09:31:20 +01:00
Johann Bauer
e3a082d58d
Fix #3907 2018-02-14 21:58:35 +01:00
SomberNight
909c063eb1 contact/invoice import: better exception handling. 
see #3904
 2018-02-14 19:42:35 +01:00
SomberNight
063e40bf18 catch IndexError in parse_redeemScript 2018-02-14 16:20:22 +01:00
SomberNight
89b43ee0cb tests: copied valid transactions from bitcoin core unit tests. try to deserialize all. 2018-02-14 15:58:58 +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
b2c0350240 allow to use exchange rates while offline 2018-02-14 10:42:59 +01:00
SomberNight
4b6a3e2e5d fix #3899; and more aggressively catch exceptions in tx.deserialize() 2018-02-14 01:20:38 +01:00
SomberNight
ea66333e48 bip32 version numbers (xpub headers): use t/u/U/v/V for testnet 2018-02-13 16:45:41 +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
15f7e09131 use config.is_dynfee and config.use_mempool_fees 
also fixes #3894
 2018-02-13 00:03:42 +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
SomberNight
4cc2575d72 cli support for hw encrypted wallets 2018-02-10 20:07:06 +01:00
ThomasV
264e80a7b7 cache historical exchange rates 2018-02-10 15:56:05 +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
670194b920
Merge pull request #3867 from SomberNight/check_trezor_version 
check trezorlib version
 2018-02-09 12:15:15 +01:00