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

8365 Commits

Author SHA1 Message Date
nxsofsys 4aee7f2f19 some missing functions 2018-01-15 04:59:22 +03:00
nxsofsys 047901d3ed switched to mainnet 2018-01-15 04:51:07 +03:00
nxsofsys 37dbdb4c3e Merge remote-tracking branch 'origin/develop' into zcl_header_chunks 
# Conflicts:
#	lib/bitcoin.py
 2018-01-15 04:32:37 +03:00
nxsofsys b2d6e083b4 new chunk size 2018-01-15 04:26:03 +03:00
nxsofsys 34150e8245 header validation 2018-01-14 23:12:30 +03:00
nxsofsys 7980846f72 validating temporary disabled for test env 2018-01-14 22:14:59 +03:00
nxsofsys 98a80f6e43 stuck at equihash validate 2018-01-14 22:07:05 +03:00
nxsofsys c1601fd749 code drop 2018-01-14 20:04:59 +03:00
Jon Layton 7cedefddeb Add (truncated) powLimit / MAX_TARGET 2018-01-13 22:34:27 -05:00
Jon Layton 2e86fe6762 Fix typo 2018-01-13 18:27:43 -05:00
Jon Layton 1dc78eedb2 Set ADDRTYPE_P2PKH and ADDRTYPE_P2SH for mainnet and testnet 2018-01-13 18:03:06 -05:00
ThomasV 066ce9679b Small fix for checking block headers @csulmone 2018-01-13 16:57:45 -05:00
Chris Sulmone c6be316e10 Ported encoding/decoding of blocks to python3.5 based of the latest electrum 3.0.5 release 2018-01-13 16:50:41 -05:00
ThomasV 830b6daf14 version 3.0.5 2018-01-13 16:45:26 -05:00
ghost43 7b4b6b8f98
Merge pull request #3710 from nothingmuch/conditionally_share_opengl_contexts 
QT: Only set "AA_ShareOpenGLContexts" if available
 2018-01-13 21:38:31 +01:00
Yuval Kogman 34256c16f8 QT: Only set if hasattr(QtCore.Qt, "AA_ShareOpenGLContexts") 
If the attribute does not exist (presumably in older versions of Qt),
this change prevents the following error:

  AttributeError: type object 'Qt' has no attribute 'AA_ShareOpenGLContexts'
 2018-01-13 20:17:02 +00:00
ThomasV c8e67e2bd0 fix #3635 2018-01-13 17:09:25 +01:00
SomberNight cc9032c9ea fix #3680 (trezor: spending from multisig) 
follow-up of #3621 (Make Electrum work with trezorlib 0.9.0)
 2018-01-12 19:21:09 +01:00
SomberNight f3f43c8f2a Revert "disable p2wpkh for hw wallets for now" 
This reverts commit e218c4a305.
 2018-01-12 18:46:08 +01:00
ThomasV d731df3b22
Merge pull request #3699 from SomberNight/qt_shareopenglcontexts 
QT: AA_ShareOpenGLContexts
 2018-01-12 16:57:49 +01:00
SomberNight 0fbc0accb9 fix-up stdio gui 2018-01-12 15:05:27 +01:00
SomberNight 4435a6c9c7 use tx.txid() instead of tx.hash() 2018-01-12 14:18:50 +01:00
ThomasV a94789b8ef fix #3619: set correct parent window 2018-01-12 12:13:19 +01:00
ThomasV 322d1bd1d0 Merge branch 'master' of github.com:spesmilo/electrum 2018-01-12 10:37:32 +01:00
ThomasV 4a40b3a0b2 separate merchant UI from main project 2018-01-12 10:37:14 +01:00
ThomasV 333b17fa60
Merge pull request #3703 from SomberNight/ledger_pin_lock_exc 
ledger: handle pin-locked state better
 2018-01-12 08:03:41 +01:00
SomberNight 2df0d7cec5 ledger: handle pin-locked state better 2018-01-12 04:03:43 +01:00
ghost43 faf8cec477
Merge pull request #3701 from marceloneil/fix-export-crash-electrum 
Fix crash when exporting private keys
 2018-01-12 01:16:21 +01:00
Marcel O'Neil fe982cf826
fix crash when exporting private keys 2018-01-11 18:19:45 -05:00
SomberNight 4f5bc9cff0 QT: AA_ShareOpenGLContexts 
Makes this go away:
"Qt WebEngine seems to be initialized from a plugin. Please set Qt::AA_ShareOpenGLContexts using QCoreApplication::setAttribute before constructing QGuiApplication."
 2018-01-11 17:49:15 +01:00
ThomasV 453cc263f7
Merge pull request #3682 from romanz/master 
Mark electrum-env script as executable
 2018-01-11 16:46:25 +01:00
ThomasV d38303354c
Merge pull request #3683 from SomberNight/wizard_scriptnotsupported 
wizard: allow to choose derivation again if script type is not supported
 2018-01-11 16:45:55 +01:00
ThomasV 1da020c415
Merge pull request #3681 from SomberNight/trezor_native_segwit 
trezor plugin: native segwit
 2018-01-11 16:45:18 +01:00
ThomasV 359882d0b1
Merge pull request #3630 from SomberNight/bip84 
bip84 for sw seeds
 2018-01-11 16:43:34 +01:00
ghost43 3c755aaa90
Merge pull request #3679 from marceloneil/ledger-version-comparison 
Better ledger version comparison
 2018-01-10 21:51:48 +01:00
Marcel O'Neil 14cfd17096
better ledger version comparison 2018-01-10 14:15:21 -05:00
SomberNight d8a9c9720a follow-up 65eae139af 2018-01-10 18:39:25 +01:00
mzhou 65eae139af add ability to show a receiving address on ledger screen (#3538) 
add ability to show a receiving address on ledger screen
 2018-01-10 18:37:41 +01:00
ThomasV c5dae933ee
Merge pull request #3690 from SomberNight/multisig_privkey_export_warning 
qt privkey export: if multisig wallet, warn users re backup
 2018-01-10 16:56:00 +01:00
SomberNight 3ef778044e qt privkey export: if multisig wallet, warn users re backup 2018-01-10 14:56:45 +01:00
SomberNight 9416e5bc35 wizard: allow to choose derivation again if script type is not supported (instead of closing the wizard) 2018-01-09 21:10:32 +01:00
Roman Zeyde 8342f1a26f chmod +x electrum-env 2018-01-09 20:19:30 +02:00
SomberNight 1387a45908 trezor plugin: native segwit and bip84 2018-01-09 17:09:58 +01:00
SomberNight 7cf547c4b8 follow-up #3621 (trezor plugin changes for trezorlib 0.9.0) 2018-01-09 16:39:39 +01:00
ghost43 ffcb926a15
Merge pull request #3677 from pooler/gettarget-fix 
Fix Blockchain.get_target()
 2018-01-08 22:56:07 +01:00
SomberNight 41660d26e9 follow-up 553bf98664 
fixes AttributeError: 'QTextEdit' object has no attribute 'text'
 2018-01-08 22:36:13 +01:00
pooler 8bcefe6cfa Fix Blockchain.get_target() 2018-01-08 21:48:09 +01:00
ThomasV 553bf98664 disable qr scanning of seeds, because the android app does not use it anymore 2018-01-08 10:25:27 +01:00
ThomasV ce22d2b4ca
Merge pull request #3665 from joren485/travis_cache 
Cache pip installs in travis
 2018-01-08 09:47:37 +01:00
ThomasV 57e0ca5a47
Merge pull request #3666 from marceloneil/fix-locale-docs 
Fix locale documentation
 2018-01-08 09:44:38 +01:00