BTCPrivate
/
-WIP-electrum-btcp
mirror of https://github.com/BTCPrivate/-WIP-electrum-btcp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,899 Commits 29 Branches 120 Tags 23 MiB
Commit Graph

7899 Commits

Author SHA1 Message Date
ThomasV ed6b2d0abf add comment about pyaes issue 2017-10-17 12:55:13 +02:00
ThomasV a2048feb24 add segwit option for cmdline create 2017-10-17 11:45:55 +02:00
ThomasV fe75699d3a Merge pull request #3053 from kyuupichan/keepkey-fix 
Remove decrypt_message; no longer supported by Trezor or KeepKey
 2017-10-17 11:25:08 +02:00
Neil Booth 21e0cd9237 Remove decrypt_message; no longer supported by Trezor or KeepKey 2017-10-17 18:19:38 +09:00
ThomasV fbb5b23e78 Merge pull request #3051 from SomberNight/win_build_hw_wallets 
fix: windows build with hw wallets
 2017-10-17 10:14:12 +02:00
ThomasV 7847a75d59 Merge pull request #3052 from SomberNight/py3_aes_encrypt_with_iv 
fix: py3 in bitcoin.py: aes_encrypt_with_iv() and aes_decrypt_with_iv()
 2017-10-17 10:11:41 +02:00
ThomasV f1792d1b13 Merge pull request #2996 from benma/mobile_pairing 
digitalbitbox: import mobile pairing config
 2017-10-17 08:21:55 +02:00
SomberNight 8a07c2654c fix: py3 in bitcoin.py: aes_encrypt_with_iv() and aes_decrypt_with_iv() 2017-10-17 07:36:04 +02:00
SomberNight dc4dd768bd fix: windows build with hw wallets 2017-10-17 04:50:17 +02:00
ThomasV 6b9bfddda2 Merge pull request #3047 from SomberNight/storage_upgrade_v13b 
fix: storage upgrade of pre-2.8 imported key wallets, and tests
 2017-10-16 07:18:04 +02:00
ThomasV d55468d1a6 Merge pull request #3046 from SomberNight/fix_trezor_unresolved_var_keystore 
fix: unresolved var in trezor/plugin.py
 2017-10-16 07:13:23 +02:00
ThomasV 566b1689b9 Merge pull request #3045 from SomberNight/trezor_unicode 
fix: rm unicode() calls in trezor plugin (py3)
 2017-10-16 07:12:53 +02:00
SomberNight d5dcdb01dd follow-up of prev commit: fix travis build (take 2) 2017-10-16 05:23:51 +02:00
SomberNight 3fe2af242e follow-up of prev commit: fix travis build 2017-10-16 05:11:05 +02:00
SomberNight 7ba233f2ab fix: storage upgrade of pre-2.8 imported key wallets, and tests 2017-10-16 04:37:01 +02:00
SomberNight 1809996bbf fix: unresolved var in trezor/plugin.py 2017-10-16 02:25:30 +02:00
SomberNight a2fdb7a396 fix: rm unicode() calls in trezor plugin (py3) 2017-10-16 01:40:13 +02:00
ThomasV ccf1f0f5d1 add class Simple_Wallet 2017-10-15 10:14:55 +02:00
ThomasV dc553ff108 fix #2991: encrypt wallet files created with command line 2017-10-15 09:18:14 +02:00
ThomasV 8d307ce1e8 rm failing test 2017-10-14 16:08:03 +02:00
ThomasV 0dbb976baf update unsigned tx format, so that imported wallets can sign all address types 2017-10-14 15:47:36 +02:00
ThomasV d472156dcd Merge pull request #3039 from SomberNight/tests_storage_upgrades1 
tests: WalletStorage upgrades
 2017-10-14 10:20:38 +02:00
SomberNight 26f439f34d tests: WalletStorage upgrades 2017-10-14 03:29:08 +02:00
ThomasV 319a31e64c Merge branch 'master' of github.com:spesmilo/electrum 2017-10-13 13:47:41 +02:00
ThomasV 3b8c8c712d fix #3038 2017-10-13 13:47:32 +02:00
ThomasV 1672bb1ffa Merge pull request #3036 from SomberNight/gui_status_stuck_in_sync 
Unstuck GUI from "synchronizing..."
 2017-10-13 12:40:14 +02:00
SomberNight 8025d81ec0 fix #3035 2017-10-13 12:38:19 +02:00
ThomasV beffd3c006 follow-up 713c3c746: fiat values need to be right aligned 2017-10-13 11:54:46 +02:00
ThomasV 628a9e0521 follow up afcc37ec34 2017-10-13 10:56:59 +02:00
ThomasV afcc37ec34 Merge pull request #3026 from SomberNight/missing_import_stat 
fix: missing import 'stat' in network.py and simple_config.py
 2017-10-13 10:55:18 +02:00
SomberNight f22f8c614f fix tests 2017-10-13 05:52:58 +02:00
SomberNight a5ffa69a3e storage: upgrade format version automatically in load_data() 2017-10-13 05:44:19 +02:00
ThomasV 1320b18d7e Merge pull request #3020 from SomberNight/tests_bitcoin1 
tests: bitcoin.py
 2017-10-13 04:39:01 +02:00
ThomasV 6a876775c4 Merge pull request #3024 from SomberNight/fix_convert_v14_redeem 
fix: storage.convert_version_14() is missing redeem_scripts
 2017-10-13 04:37:39 +02:00
ThomasV 2b6c848ed9 Merge pull request #3033 from SomberNight/network_dialog_fixes1 
network dialog fixes
 2017-10-13 04:36:18 +02:00
SomberNight 96ce6e542e network dialog fixes 2017-10-13 01:13:03 +02:00
ThomasV 633d44f268 Merge pull request #3032 from SomberNight/non_sw_txin_witness 
fix: witness for non-segwit txins
 2017-10-12 22:38:01 +02:00
SomberNight 8e007f026d fix: witness for non-segwit txins 2017-10-12 21:44:08 +02:00
ThomasV 8c55bbd1f3 Merge pull request #3030 from achow101/tray-menu-fix 
Modify tray context menu instead of creating a new one
 2017-10-12 18:44:02 +02:00
ThomasV 2a80f68778 improve network dialog. fixes #2898 2017-10-12 18:35:45 +02:00
Andrew Chow 9dc3eceea9 Modify tray context menu instead of creating a new one 
Instead of creating a new context menu and setting it with setContextMenu,
simply clear and modify the existing context menu.
 2017-10-12 12:26:42 -04:00
ThomasV 482458d00d fix #3028: add info to proxy dialog 2017-10-12 17:09:28 +02:00
ThomasV 6b8f685b42 fix #3027 2017-10-12 10:28:56 +02:00
SomberNight 0510bdb85b fix: missing import 'stat' in network.py and simple_config.py 2017-10-12 08:04:55 +02:00
SomberNight 2ad061eead fix: storage.convert_version_14() was missing redeem_scripts 2017-10-12 06:40:41 +02:00
SomberNight 681eb1ccb8 tests: for bitcoin.py, added new ones, and some refactoring for existing 
new ones mainly include:
- privkey -> pubkey -> addr conversions
- xprv, xpub operations
 2017-10-11 18:46:52 +02:00
ThomasV f381eae251 Merge pull request #3017 from SomberNight/fix_is_minikey 
fix: bitcoin.is_minikey() is broken
 2017-10-11 16:35:08 +02:00
SomberNight 843aec80d7 fix: bitcoin.is_minikey() was broken 2017-10-11 16:27:39 +02:00
ThomasV 4694717dc0 Merge pull request #3015 from SomberNight/typo_p2wpkh_importedwallet 
fix: Imported_Wallet cannot spend from p2wpkh or p2wpkh-p2sh
 2017-10-11 14:13:53 +02:00
SomberNight e406829904 fix: Imported_Wallet cannot spend from p2wpkh or p2wpkh-p2sh 2017-10-11 14:00:38 +02:00