Commit Graph

8387 Commits

Author SHA1 Message Date
nxsofsys 0c1865f8b5 fixed target calculation 2018-01-17 05:30:27 +03:00
Chris Sulmone 6c1f72564b Added a fix for URI parsing and defined shielded transaction constants 2018-01-15 11:20:41 -06:00
Jon Layton 2894cc52ab Name zcl-explorer 2018-01-15 04:30:08 -05:00
Jon Layton d2cbd45fd3 Merge branch 'live-servers' 2018-01-15 04:27:11 -05:00
Jon Layton be560553f8 syntax 2018-01-15 04:20:45 -05:00
Jon Layton 690edbc6bc Changed explorers to 3 known zcl full nodes 2018-01-15 03:57:38 -05:00
Jon Layton 9047d4a3e2 Connects to electrum-zcl.com 2018-01-15 02:38:45 -05:00
MrWh0 47a61a192f test servers 2018-01-15 03:16:15 -04:00
MrWh0 d8d6c1dc86 revert mod imp name 2018-01-15 03:05:47 -04:00
Jon Layton df8803ddc1 Merge branch 'develop' 2018-01-15 01:51:52 -05:00
Chris Sulmone 1efbf83241 Fix for b58 address check 2018-01-14 23:51:20 -06:00
Chris Sulmone 5ff77230c7 Fixed parsing and encoding of t addresses for ZCL 2018-01-14 23:28:40 -06:00
MrWh0 3d4cfc45c7 test config sample file 2018-01-15 01:09:48 -04:00
Jon Layton 9eb67a6394 Bitcoin->Zclassic BTC->ZCL in ui 2018-01-14 23:43:33 -05:00
Jon Layton 1dad9e8893
Merge pull request #6 from BTCP-community/chunk_write_fix
chunk write fix
2018-01-14 21:15:44 -06:00
nxsofsys 6670b94fc0 chunk write fix 2018-01-15 06:11:35 +03:00
Jon Layton 31c8d0973d Update readme with script and config info 2018-01-14 21:41:18 -05:00
Jon Layton 7e79d59e9b Added clean.sh, servers-orig 2018-01-14 21:34:22 -05:00
Jon Layton 615ea50786 Merge branch 'develop' 2018-01-14 21:25:53 -05:00
Jon Layton 18ca29bfa9
Merge pull request #2 from BTCP-community/zcl_header_chunks
Zcl header chunks
2018-01-14 20:23:40 -06:00
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
Jon Layton 60ad2e14a2 Merge branch 'develop' 2018-01-14 18:49:19 -06:00
Jon Layton f3191aefc4
Merge pull request #1 from BTCP-community/zcl_headers
Zcl headers
2018-01-14 18:35:55 -06: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