Commit Graph

3511 Commits

Author SHA1 Message Date
ThomasV f6cc37d1d2 Merge branch 'master' of github.com:spesmilo/electrum 2017-10-26 11:23:41 +02:00
ThomasV ffc0cc3c1f Merge pull request #3123 from SomberNight/fix_parse_witness_coinbase
fix: transaction.parse_witness() for coinbase
2017-10-26 11:23:28 +02:00
SomberNight 32e88495ae fix: transaction.parse_witness() for coinbase 2017-10-26 00:40:08 +02:00
SomberNight fb47dbb75a tests: transaction.txid() 2017-10-26 00:35:18 +02:00
ThomasV 89240571d4 py3: socket.error is deprecated 2017-10-25 18:22:54 +02:00
ThomasV 1cbc794229 interface: catch py3 exceptions 2017-10-25 17:43:30 +02:00
SomberNight 1f102913e9 typo in wallet.import_private_key() 2017-10-25 06:54:51 +02:00
ThomasV 5665b42999 remove six 2017-10-24 14:04:16 +02:00
SomberNight 523de69b5e Introduced BasePlugin.can_user_disable(). TrustedCoin plugin can't be disabled by user. 2017-10-24 04:42:52 +02:00
ThomasV 6e0e5a8d57 wizard: allow segwit seed as cosigner 2017-10-23 06:42:34 +02:00
SomberNight 2457ac8774 fix #3091 2017-10-22 23:47:11 +02:00
ThomasV 7cf075c754 follow up b8c7edf070 2017-10-22 15:14:09 +02:00
SomberNight 29c34332ac fix: contacts import 2017-10-22 13:46:05 +02:00
ThomasV 8683d71711 fix: witness serialization 2017-10-22 12:39:36 +02:00
ThomasV b8c7edf070 return bytes in scan_barcode 2017-10-22 12:04:00 +02:00
SomberNight aa1289fa5d bitcoin.py AES: implement our own PKCS7 padding 2017-10-22 02:32:58 +02:00
ThomasV 198cc9d737 fix #2614: define non-linear scale for static fees 2017-10-21 11:15:59 +02:00
Dan Haiduc 5e589133c9 Update commands: output str(Decimals), not floats
The commands `listunspent` and `history` were using float.
Patched to consistently return strings of Decimal objects.
2017-10-20 21:35:18 +03:00
Antoine Riard 9ebca74724 fix: check_seed command import path 2017-10-20 12:03:02 -04:00
ThomasV 24442de8df fix command line interface for hardware wallets. fixes #3056 2017-10-19 11:59:36 +02:00
SomberNight f69f6a88e0 py3: signmessage cmd now again returns str 2017-10-17 20:15:33 +02:00
ThomasV 0a648e2b1c cleanup commented lines 2017-10-17 12:59:59 +02:00
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
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 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
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
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
SomberNight 8025d81ec0 fix #3035 2017-10-13 12:38:19 +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
SomberNight 8e007f026d fix: witness for non-segwit txins 2017-10-12 21:44:08 +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
SomberNight 843aec80d7 fix: bitcoin.is_minikey() was broken 2017-10-11 16:27:39 +02:00
SomberNight e406829904 fix: Imported_Wallet cannot spend from p2wpkh or p2wpkh-p2sh 2017-10-11 14:00:38 +02:00
ThomasV 6656154b78 add 'createnewaddress' command, separate from getunusedaddress 2017-10-11 12:24:55 +02:00
ThomasV de85b56e0a re-enable locktime 2017-10-11 12:24:55 +02:00