Commit Graph

12 Commits

Author SHA1 Message Date
Vivek Teega
3f628b70a5 Merging upstrem changes 2018-12-16 17:44:11 +05:30
Vivek Teega
34e84858c8 Changed naming from BTC -> FLO 2018-11-22 11:03:15 +05:30
SomberNight
6958c0ccc3
config: reject non-json-serialisable writes
see #4788
2018-10-21 14:58:55 +02:00
SomberNight
a61953673a
fees: add 1-2 s/b static options 2018-10-02 15:44:09 +02:00
Vivek Teega
6a2d2fbc3d Creating Morph branch
This is an attempt to commit the changes made to Electrum-BTC to morph it into FLO, on top of the latest Electrum-BTC codebase at the time of writing. The code has become messy pulling upstream changes and its become difficult to debug issues
2018-09-29 17:52:30 +05:30
Vivek Teega
9e0777a7b4 Solved upstream merge conflicts 2018-09-12 03:38:43 +05:30
SomberNight
0142e0fa22
fix 'daemon load_wallet' over RPC for python > 3.5.3
related: #3764
2018-09-06 15:14:35 +02:00
Bitspill
e0d33279de Commiting changes made by @bitspill
The following are the changes made by @bitspill to the original repo.
1. Changes to transaction.py to accomodate the txcomment/floData feature
2. Changes in server list
3. Renaming of BTC to FLO
The GUI and code changes required for exchange_rate.py file haven't been implemented. Its an independant module of the wallet, so will be changed later on
2018-08-05 16:10:36 +05:30
SomberNight
629b9cb3b5
fee estimation: split eta_to_fee into two methods 2018-07-30 19:15:05 +02:00
SomberNight
8bb59fcc3c
follow-up prev: fix bug in fee_to_depth, and typo and tests 2018-07-14 19:02:41 +02:00
SomberNight
b8ab36546d
mempool fees: increase estimate by max precision of histogram
related: #4551
2018-07-14 18:45:02 +02:00
Janus
097ac144d9 file reorganization with top-level module 2018-07-13 14:01:37 +02:00