RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,266 Commits 17 Branches 118 Tags 33 MiB
355b526db9
Commit Graph

4131 Commits

Author SHA1 Message Date
SomberNight
141994ed1b
tests: TestWalletSending - also test raw_tx and wtxid 2018-06-01 18:05:49 +02:00
SomberNight
2b84fba67b
storage upgrade as part of the wizard. fix storage upgrade on kivy. 2018-05-31 19:43:50 +02:00
SomberNight
ec5931ae54
rename dylib for libsecp 
follow c76375de91
 2018-05-30 22:50:03 +02:00
SomberNight
1e06b1921e
wallet.py: access unverified_tx with self.lock 
Only actually needed due to Imported_Wallet.delete_address, but it takes some time to see this.
The verifier and the synchronizer both access unverified_tx but they are both run in the Network thread.
In any case, there does not seem to be a measurable performance hit when using the lock.
 2018-05-30 19:01:47 +02:00
SomberNight
060404e17c
wallet/verifier: persist wallet.verified_tx when verifier finishes 
Previously verified_tx was only persisted in wallet.stop_threads(), hence only on clean shutdowns.
 2018-05-30 18:21:29 +02:00
SomberNight
4159322db0
synchronizer.py: rename tx_response to on_tx_response 2018-05-30 17:35:29 +02:00
SomberNight
ee9861f0d5
wallet.py: access verified_tx with lock 2018-05-30 13:24:58 +02:00
SomberNight
6bb7558f75
InvalidPassword undefined in wallet.py 2018-05-30 13:14:01 +02:00
SomberNight
deb945d810
tests: TestWalletHistory_EvilGapLimit 2018-05-29 20:51:04 +02:00
SomberNight
7218bf1d14
tests: bip32 extended version bytes 2018-05-28 20:27:08 +02:00
ghost43
9b7a449057
util.make_dir: 0o700 permissions on folders (#4357) 2018-05-28 14:22:54 +02:00
SomberNight
dbec3af810
tests: introduce FAST_TESTS flag for faster local testing 2018-05-28 14:02:07 +02:00
SomberNight
1f373c1eb9
ecc: don't print trace when can't find libsecp 2018-05-28 02:28:01 +02:00
SomberNight
86992aea6c
bundle libsecp256k1 in android apk 
this works as there is already a p4a recipe upstream: 74bf788a29/pythonforandroid/recipes/libsecp256k1/__init__.py
 2018-05-28 00:43:05 +02:00
SomberNight
facb7bbc0e
ecc: (minor) use ECPubkey.from_point 2018-05-27 03:55:10 +02:00
SomberNight
ac94d6d055
ecc: ECPrivkey.sign clean-up 2018-05-26 19:26:13 +02:00
SomberNight
d03da4d1a2
tests: test with all AES implementations 2018-05-25 22:06:45 +02:00
SomberNight
dc1d6ac1fe
avoid hardcoding the curve generator ourselves 2018-05-25 18:29:44 +02:00
SomberNight
7c53712750
load_library: remove ctypes.util.find_library calls. remove some code dupe 
find_library was giving priority to system dll against local dll
 2018-05-25 18:20:56 +02:00
SomberNight
16e4827e8c
use libsecp256k1 if available. abstract away ecc stuff. move symmetric crypto and hash functions to crypto.py 2018-05-25 15:43:06 +02:00
SomberNight
756cc323e7
tests: dnssec 2018-05-24 22:20:58 +02:00
Johann Bauer
2e899bc38f
Add missing languages to settings dialog 2018-05-23 22:15:14 +02:00
SomberNight
51d047a35e
fix #4375 2018-05-22 12:55:50 +02:00
ThomasV
4c234397ec
Merge pull request #4351 from SomberNight/2fa_sign_then_otp 
trustedcoin: sign first, then prompt for OTP
 2018-05-18 17:36:18 +02:00
SomberNight
c113232e8b
tests: TestWalletHistory 
check if wallet logic calculates correct balance regardless of the order in which we receive transactions from the server
 2018-05-18 15:43:02 +02:00
SomberNight
5cfeb6b081
follow-up ab2f59590c 2018-05-18 10:56:01 +02:00
Harm Aarts
ab2f59590c Push network calls into network module 
Eventually all network calls should go through the network module
without resorting to using raw protocol strings. This, then, makes
adding an other backend easier.
Please note that the behaviour slightly changed. Initially the caller
received an unmodified response from the ElectrumX server. In it the
scripthash is present. This change replaces that scripthash with the
original address.
 2018-05-17 15:20:22 +02:00
Harm Aarts
812d570ee2 Rename method to reflect its goal 
Answer the question *what* problem the method solves. Not *how* it is
solving it.
 2018-05-17 15:17:06 +02:00
Harm Aarts
d0d39e534e Make side effect explicit 
The removed method didn't allude to the fact it was adding the generated
hash to a dictionary. This was problematic since the code base now
seemingly had two methods for converting an address to a scripthash. One
in the network module and one in the (logical) bitcoin module.
 2018-05-17 12:04:54 +02:00
SomberNight
b88f0434c5
wallet.py: check_history depends on load_local_history and build_spent_outpoints 
if it tries to call add_transaction
 2018-05-16 11:31:20 +02:00
SomberNight
e375bf48c4
transaction.py: reserialize scriptSig for incomplete txin 
On offline imported privkey + online imported address config, the offline wallet was displaying incorrect tx size.
 2018-05-15 18:53:25 +02:00
SomberNight
7c7aa5828b
tests: added p2wpkh-p2sh wallet to TestWalletSending 2018-05-14 18:33:14 +02:00
SomberNight
f12798e91c
follow-up #4324 2018-05-14 17:49:17 +02:00
SomberNight
a94e1d92a3
bitcoin.py: nicer exception in deserialize_privkey if prefix byte is invalid 
related: #4364
 2018-05-13 16:26:00 +02:00
SomberNight
b175c6b609
fix #4360 2018-05-13 03:11:20 +02:00
ghost43
dae187bada
allow fractional feerates (#4324) 2018-05-09 19:30:18 +02:00
ghost43
3337af0734
transaction.py: (txin guess) fix some false positive matches of p2sh-segwit (#4336) 2018-05-09 19:16:01 +02:00
SomberNight
ceae43afe5
trustedcoin: sign first, then prompt for OTP 2018-05-08 20:04:36 +02:00
SomberNight
c03d68d758
add 'sat' as base unit option 2018-05-05 12:52:19 +02:00
Andreas Schildbach
7dc5d64cba Remove server from default list: cryptohead.de (#4320) 2018-05-03 20:30:42 +02:00
SomberNight
ae24af9bc2
wizard: move GoBack from Qt wizard to base_wizard 2018-05-01 14:47:50 +02:00
SomberNight
c8bed8791a
assert datadir available 2018-04-29 18:25:10 +02:00
SomberNight
cbf1b5d9d5
py3.4 compat: follow-up e13183ea7a 2018-04-29 15:06:19 +02:00
SomberNight
fad25af204
fix tests for travis. follow-up 68d8919416 2018-04-27 21:55:50 +02:00
SomberNight
ea55d886b7
follow-up 1d6f000868 
I broke multisig..
 2018-04-27 21:44:29 +02:00
SomberNight
68d8919416
tests: sends between wallets 2018-04-27 21:43:46 +02:00
SomberNight
e13183ea7a
bitcoin.py: SCRIPT-related clean-up. transaction.py: construct_witness 2018-04-27 16:16:27 +02:00
SomberNight
97296432a2
transaction.py: sign_txin. allow override for get_preimage_script. 2018-04-27 16:16:27 +02:00
SomberNight
1d6f000868
transaction.py: shortcut witness/scriptSig serialisation 2018-04-27 16:16:14 +02:00
SomberNight
b3110b3b46
bitcoin.py: implement add_number_to_script. 2018-04-27 16:15:44 +02:00
SomberNight
4b89b1e270
implement script_num_to_hex 2018-04-27 16:15:43 +02:00
Filip Gospodinov
61154794c8 electrum: cleanup plugin imports 
`electrum_plugins` is imported in the `electrum` script
without being used - I assume it's done to make PyInstaller
find that package. But this can be achieved by avoiding
the usage of `__import__()` when importing `electrum_plugins`
where it's effectively used.
 2018-04-26 06:12:20 +02:00
Filip Gospodinov
376a815458 exchange_rate: prefer relative imports (#4308) 
As this project is currently structured, absolute
imports have the drawback that they'll load modules
from installed paths rather then from the local repo
when running unit tests. This somehow breaks the main
idea of unit tests which is being able to quickly test
newest development changes. Therefore, use a relative
import here.
 2018-04-25 09:42:07 +02:00
Ben Woosley
53320470f5 Format the transaction window fee rate with 1 decimal place (#4286) 
* Fix format_satoshi to properly handle non-integer values

Handling the integer and fraction parts together via string formatting
simplifies the initial composition because the default behavior manages
the - sign, and the incorporation of the fractional part.

* Limit fee rate output to one decimal place

Via a new precision arg

* Introduce format_fee_satoshis and use it for all fee display
 2018-04-24 18:54:14 +02:00
SomberNight
0be73ed546
wallet.py: small optimisation for get_wallet_delta 2018-04-24 15:26:56 +02:00
mhitcher
5284aef820 added therocktrading exchange rate (#4272) 2018-04-24 09:28:38 +02:00
ThomasV
7cee37dfb8 show bitcoin price info in history summary 2018-04-19 14:05:19 +02:00
ThomasV
624fa4769d prepare release 3.1.3 2018-04-16 18:43:02 +02:00
Dimitris Apostolou
989c9c2b55 Fix typos 2018-04-15 20:34:40 +02:00
SomberNight
44bb1e9993
bitcoin.py: fix op_push 
8cbc5c4be4/src/script/script.h (L464)
fdc2bc867b/txscript/scriptbuilder.go (L151)
 2018-04-14 16:13:51 +02:00
SomberNight
8bdf863fca
fix: android HistoryScreen was not displaying fiat value of unconfirmed txns 2018-04-12 16:49:25 +02:00
SomberNight
3bf5afa61a
fix #4253 2018-04-12 12:17:24 +02:00
SomberNight
1935d7d165
wallet.py: remove local transactions that we don't have 
fixes #4232
closes #4234
 2018-04-11 19:53:33 +02:00
SomberNight
7dcefd999f
wallet.py: remove_transaction - make sure we pop from both txi and txo 2018-04-11 19:51:35 +02:00
SomberNight
4fed27610a
wallet.py: load unverified_tx in __init__ 2018-04-11 19:45:13 +02:00
SomberNight
86b1273ec0
wallet.py: minor reordering in __init__ 2018-04-11 19:45:12 +02:00
SomberNight
ebcc983566
wallet.py: build local history from txi and txo, not transactions 2018-04-11 19:45:12 +02:00
fivepiece
b4d71e651b add regtest support (#4242) 
* add regtest support

* set default regtest ssl and tcp ports to 51002 and 51002

* regtest inherits parameters from testnet
 2018-04-11 19:10:14 +02:00
SomberNight
b68f5645cb
fix #4254 2018-04-11 18:31:35 +02:00
SomberNight
1f937aa6cd
fix: 'oneserver' could only be set in the CLI 2018-04-11 11:16:29 +02:00
SomberNight
7b50790584
do not raise BaseException 2018-04-07 17:10:30 +02:00
SomberNight
76e67daadd
changed some asserts to raise-exceptions in lib 2018-04-07 17:01:38 +02:00
ghost43
cf88e239d7
fix parsing values in setconfig (#4225) 2018-04-06 18:53:13 +02:00
SomberNight
4ff3791cb9
fix #4236 2018-04-06 16:43:11 +02:00
SomberNight
0180abc179
blockchain.py: check header length 
related: #4212
 2018-04-05 16:12:34 +02:00
SomberNight
e4dad0a425
fix #4198 2018-04-05 12:52:21 +02:00
SomberNight
d2a1179087
fix #4227 2018-04-05 12:22:01 +02:00
ThomasV
ad6dd73a03 do not catch OSError in pipe.send (fix ANR on some versions of Android) 2018-04-05 11:27:12 +02:00
SomberNight
de4fe9db69
fix a race condition in synchronizer 
wallet.synchronizer gets assigned a newly constructed Synchronizer instance.
Synchronizer in tx_response refers to the value of wallet.synchronizer.
If the wallet has a missing txn, there could be a race condition that synchronizer asks for a txn and we get the callback from the network WHILE the constructor is still running, in which case wallet.synchronizer would still be None and we would consider the callback "orphan", and the wallet would get "stuck" synchronizing.
 2018-04-05 08:32:02 +02:00
ThomasV
eb4463063f
Merge pull request #4214 from SomberNight/payto_read_rbf_from_config 
payto: get RBF setting from config
 2018-04-04 15:26:49 +02:00
SomberNight
92c45ac29a
fix prev: txns might be added in any order 2018-04-04 01:22:49 +02:00
SomberNight
17512f7f47
wallet: speed up get_address_history 2018-04-03 22:16:29 +02:00
SomberNight
ffe69cb328
fix #4220 2018-04-03 19:18:10 +02:00
SomberNight
13bd10e1cb
wizard: add naive debug message to hw device scan if none are found 2018-04-03 14:21:22 +02:00
SomberNight
42582b6a64
fix #4219 2018-04-03 02:48:55 +02:00
SomberNight
5a508f7b8d
fix #4218 2018-04-03 01:50:37 +02:00
SomberNight
4d15d4e459
payto: get RBF setting from config 2018-04-02 05:30:58 +02:00
SomberNight
58273fc841
tests: xpub version bytes 2018-04-01 16:56:17 +02:00
SomberNight
ff57c198b4
fix prev 2018-04-01 16:52:24 +02:00
fivepiece
192288c025 change testnet p2wsh-p2sh prefix to 0x024289ef to reflect Upub (#4210) 
* change testnet p2wsh-p2sh prefix to 0x024289ef to reflect Upub

* add testnet p2sh-p2wsh 2of2 multisig test
 2018-04-01 16:48:54 +02:00
SomberNight
9de4d19c5a
tests: refactoring in test_wallet_vertical.py 2018-04-01 16:44:59 +02:00
SomberNight
1eae16aa3e
tests: class TestCaseForTestnet 2018-04-01 15:50:24 +02:00
SomberNight
5926438847 fix #3294 2018-03-27 23:40:46 +02:00
SomberNight
ec33463426 fix #4184 2018-03-27 20:17:37 +02:00
ThomasV
c9c7f34ddf prepare version 3.1.2 2018-03-27 18:26:23 +02:00
ThomasV
2886bf8a05
Merge pull request #4061 from Yuki-Inoue/feature/current_wallet_path 
daemon status shows current wallet path
 2018-03-27 11:04:46 +02:00
ThomasV
032f40640e revert previous commit, use #4062 2018-03-25 23:38:55 +02:00
ThomasV
d9c0591425 do not set cmd_runner.wallet when wallet is loaded. closes #4062 2018-03-25 23:08:25 +02:00
ThomasV
95780a39a3
Merge pull request #4169 from SomberNight/open_utf8 
use explicit utf-8 encoding when opening files in text mode
 2018-03-25 10:35:37 +02:00
SomberNight
fa91cbf762 network - send_subscriptions: copy subscribed_addresses before iterating 
see #4146
(this should at least avoid the RuntimeError)
 2018-03-24 18:34:51 +01:00
SomberNight
9b7536e75c use explicit utf-8 encoding when opening files in text mode 2018-03-23 21:47:51 +01:00
ThomasV
05342c5537
Merge pull request #4117 from SomberNight/pay_to_script 
fix paying to script
 2018-03-23 19:42:04 +01:00
SomberNight
d146c369bf fix #4164 2018-03-22 21:48:51 +01:00
ThomasV
800c783580
Merge pull request #4115 from SomberNight/disallow_adding_requests_w_invalid_addresses 
disallow adding receive requests without valid is_mine addresses
 2018-03-22 15:34:05 +01:00
ThomasV
bf67920f7f
Merge pull request #4133 from laseryuan/patch-1 
Fix the error: locktime is always reset to zero when serialize the js…
 2018-03-22 12:25:58 +01:00
ThomasV
f8f00188ed
Merge pull request #4148 from SomberNight/hw_wallet_output_ismine_der 
trezor/keepkey/dbb: provide derivation info for all is_mine txn outputs
 2018-03-22 12:18:59 +01:00
SomberNight
c0a42b756b fix #4159 2018-03-22 08:18:27 +01:00
SomberNight
a00439b6f8 fix #4158 2018-03-22 07:27:18 +01:00
SomberNight
77c8010517 bitcoin.py: parameterise a few address-related methods with network 2018-03-20 17:02:49 +01:00
SomberNight
7d11812f55 trezor/keepkey/dbb: provide info for all is_mine txn outputs 2018-03-20 02:04:41 +01:00
ThomasV
35ae2a0064
Merge pull request #4143 from SomberNight/wallet_file_exception 
Catch wallet file related exceptions in Qt wizard
 2018-03-19 11:57:24 +01:00
SomberNight
5fef1e7980 close #4125 
perhaps not proper fix but at least more descriptive exception text
 2018-03-19 01:26:57 +01:00
SomberNight
36d52dfd5a fix #4129 2018-03-19 01:04:02 +01:00
SomberNight
22061b4555 transaction.get_address_from_output_script now handles witness version > 0 2018-03-18 06:18:48 +01:00
SomberNight
85b36e027f fix a bug with hw devices. 
if a device is unplugged and then replugged before we notice (via scan_devices) then it will get into an unusable state, throwing all kinds of low level exceptions when we don't expect it. affects ledger, keepkey, dbb, but for some reason not trezor.
 2018-03-18 03:54:28 +01:00
SomberNight
61a45edee0 Catch wallet file related exceptions in Qt wizard. 2018-03-17 22:56:20 +01:00
SomberNight
c79de3ab3c fix #4139 2018-03-16 22:06:38 +01:00
Laser Yuan
8a5d27dcf4
Fix the error: locktime is always reset to zero when serialize the json data 
The "lockTime" field in the json object was ignored due to the wrong attribute name "locktime" was called.
 2018-03-16 12:06:33 +08:00
SomberNight
c0ae266d39 DeviceMgr: scan_devices can work without hid 2018-03-16 00:55:45 +01:00
SomberNight
aabd9f01ee wizard hw devices: only scan once 2018-03-15 20:03:12 +01:00
SomberNight
afa4cbfcbb fix #4082 2018-03-15 18:34:30 +01:00
SomberNight
8dd19a5920 wizard: remove unused method 2018-03-15 06:14:57 +01:00
SomberNight
37853ab939 trezor/keepkey: don't show empty error on PIN prompt cancel 2018-03-15 06:08:13 +01:00
ThomasV
5e5134b76f remove custom entropy option again (follow-up e0c38b3), because seeds can be extended with passphrase 2018-03-14 14:59:27 +01:00
ThomasV
4137ae94a0 flush certificate file; might fix #4059 2018-03-13 15:07:19 +01:00
SomberNight
b043c872eb fix paying to script 2018-03-13 06:37:02 +01:00
SomberNight
a6841cbd5f fix #4099: serialisation of txns with negative version number 2018-03-13 01:02:03 +01:00
SomberNight
8e79d09511 disallow adding receive requests without valid is_mine addresses 2018-03-12 21:50:56 +01:00
ThomasV
c3e26a1e2b fix #4098 2018-03-12 12:19:45 +01:00
ThomasV
152ec1447c fix #4100: spent_outpoints does not track everything 2018-03-12 11:56:00 +01:00
ThomasV
cf866adfe3 fix #4109 2018-03-12 10:30:56 +01:00
ThomasV
0603f9f2b4 fix #4108 2018-03-12 10:18:09 +01:00
SomberNight
a048a00594 close #4102 
close #3337
 2018-03-12 04:00:27 +01:00
SomberNight
e31c2d491d fix #4093 2018-03-11 07:18:07 +01:00
SomberNight
99647fc070 careful with exceptions.. 2018-03-10 08:16:19 +01:00
SomberNight
2c6cf7f80c careful with exceptions.. 2018-03-10 08:00:41 +01:00
SomberNight
d994d27704 hw wallet encryption unlock: clear session on incorrect passphrase 2018-03-10 03:59:01 +01:00
SomberNight
f3d254ff1e follow-up prev 2018-03-10 00:37:16 +01:00
SomberNight
6f5a4677d1 clean up imports in lib/plot.py 2018-03-10 00:23:51 +01:00
SomberNight
9372c31b5d fix #4084 2018-03-09 19:10:57 +01:00
SomberNight
08aee6a857 logging - use self.print_error instead of util.print_error 2018-03-09 14:58:13 +01:00
SomberNight
c13e057701 fix #4080 2018-03-09 03:18:53 +01:00
SomberNight
6f0a7ff420 fix #4077 2018-03-09 01:38:35 +01:00
ThomasV
2deae196d9 this probably fixes #4072 2018-03-08 10:14:32 +01:00
SomberNight
192e895933 hw plugins: catch exceptions for custom enumeration functions. 
related: #4060
 2018-03-07 16:11:20 +01:00
SomberNight
b02252d664 fix #4065 2018-03-07 14:43:14 +01:00
Yuki Inoue
fc9cb0ca1c daemon status shows current wallet path 
All the jsonrpc calls against electrum daemon is affected by the
implicit parameter of wallet in the cmd_runner.  AFAIK, there is no way
to check the value of this wallet.  This can be trouble some if multiple
wallets are loaded, or load_wallet command is executed several times.

This patch makes it viewable on the `daemon status`.
 2018-03-07 13:51:06 +09:00
SomberNight
e0cda39ae5 only cache expensive case 2018-03-06 17:15:14 +01:00
SomberNight
db0e3cd209 speed-up wallet.get_full_history: cache coin_price 2018-03-06 16:56:51 +01:00
SomberNight
d002549176 wallet.get_full_history: only do fiat calc, if enabled 2018-03-06 16:37:17 +01:00
SomberNight
0c2547543d fix openalias py3 2018-03-06 16:08:49 +01:00
SomberNight
f90c0d73db fix #4032 2018-03-06 16:07:33 +01:00
SomberNight
135c5e805d fix #4046 2018-03-06 12:41:37 +01:00
SomberNight
e5cba92564 transaction serialization: fix segwit coinbase case. 
adjust unit tests so that they would have caught it.
 2018-03-06 10:34:52 +01:00
ThomasV
ade7cce144 fix #4034 2018-03-06 07:13:35 +01:00
Johann Bauer
4c81a77ccc
Revert "Check if value has 'is_nan' before calling it" 
This reverts commit 1451c66a8f.
 2018-03-05 23:24:12 +01:00
Johann Bauer
1451c66a8f
Check if value has 'is_nan' before calling it 
Fixes: #4034
 2018-03-05 23:07:52 +01:00
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