zcash-hackworks
/
zcash-patched-for-explorer
mirror of https://github.com/zcash-hackworks/zcash-patched-for-explorer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,681 Commits 5 Branches 0 Tags 57 MiB
Commit Graph

7681 Commits

Author SHA1 Message Date
Jeff Garzik 39d6b5fd42
Merge #5528 from 
branch 'bitcoin-tx-copy-paste' of git://github.com/ers35/bitcoin into merge-5528
 2014-12-31 08:57:55 -05:00
Jeff Garzik 664999eb87
Merge #5578 from 
branch 'error_typos' of git://github.com/paveljanik/bitcoin into merge-5578
 2014-12-31 08:00:37 -05:00
Jeff Garzik ccef2b5f26
Merge #5468 from 
branch 'developer-notes_md' of git://github.com/fanquake/bitcoin into merge-5468
 2014-12-31 07:42:24 -05:00
Jeff Garzik 95ecc0a857
Merge #4964 from 
branch 'validateaddress-return-scriptpubkey' of git://github.com/petertodd/bitcoin into merge-4964
 2014-12-31 07:05:14 -05:00
Jeff Garzik aa5c0d34b7
Merge #5111 from 
branch 'core2' of git://github.com/jtimon/bitcoin into merge-5111
 2014-12-31 06:48:42 -05:00
Wladimir J. van der Laan a5eb61d9ef
Merge pull request #5499 
7f71813 Bugfix: prioritisetransaction: Do some basic sanity checking on txid (Luke Dashjr)
 2014-12-31 10:50:06 +01:00
Wladimir J. van der Laan 639c79a41f
Merge pull request #5545 
a094b3d Remove bitnodes.io from dnsseeds. (Gregory Maxwell)
 2014-12-31 10:42:58 +01:00
Wladimir J. van der Laan 6e557c2b9d
Merge pull request #5571 
06206bb Correct tooltip on address book page (Michael Ford)
 2014-12-31 10:35:52 +01:00
Wladimir J. van der Laan 83d6d59c2b
Merge pull request #5546 
1f67084 [Docs] clean up assets-attributen.md (Jonas Schnelli)
 2014-12-31 09:51:11 +01:00
Wladimir J. van der Laan 0a42036ded
Merge pull request #5576 
8f6860a Bugfix: RPCWallet: Docs: Booleans aren't quoted (Luke Dashjr)
 2014-12-31 09:46:00 +01:00
Wladimir J. van der Laan 7b5924c95f
Merge pull request #5566 
78a7cd3 Updated license date (Ben Holden-Crowther)
 2014-12-31 09:40:36 +01:00
Pavel Janík 4f1ee565b5 Clean AcceptToMemoryPool error messages 2014-12-30 23:02:46 +01:00
Wladimir J. van der Laan f9c571aad8
Merge pull request #5565 
8db1760 rpcserver: attempt to fix uncaught exception. (Cory Fields)
 2014-12-30 17:36:30 +01:00
Luke Dashjr 8f6860a083 Bugfix: RPCWallet: Docs: Booleans aren't quoted 2014-12-30 15:15:40 +00:00
Michael Ford 06206bb3b7 Correct tooltip on address book page 2014-12-30 17:46:57 +08:00
Ben Holden-Crowther 78a7cd38f4 Updated license date 
Changed 2014 to 2015 in preparation for new year
 2014-12-29 20:50:57 +00:00
Cory Fields 8db1760751 rpcserver: attempt to fix uncaught exception. 2014-12-29 15:20:09 -05:00
Wladimir J. van der Laan a99ef7d353
Merge pull request #5505 
469d564 Build winshutdownmonitor.cpp on Windows only. (Pavel Janík)
 2014-12-29 13:44:02 +01:00
Wladimir J. van der Laan ed11d53077
Merge pull request #5514 
be43492 build: fix 'make distcheck' (Cory Fields)
 2014-12-29 10:05:02 +01:00
Wladimir J. van der Laan 565b3008ec
Merge pull request #5530 
7c5dd60 Adding RPC tests for the following wallet related calls: getbalance, listsinceblock, listtransactions, listlockunspent, listaccounts listaddressgroupings (Everett Forth)
 2014-12-29 09:53:01 +01:00
Wladimir J. van der Laan 5f5f14e9f2
Merge pull request #5554 
244fdc7 Fix typo (Julian Yap)
 2014-12-29 09:19:45 +01:00
Wladimir J. van der Laan f8c48589cf
Merge pull request #5558 
99913f0 Fix reference. (Thomas Zander)
 2014-12-29 09:16:25 +01:00
Thomas Zander 99913f0f70 Fix reference. 
The text talked about "Quit" while Bitcoin uses "Exit" in its menu.
 2014-12-28 22:57:39 +01:00
Julian Yap 244fdc7bee Fix typo 2014-12-28 00:22:44 -10:00
Wladimir J. van der Laan e5153095ea
Merge pull request #5493 
9b7d3fb Adopt style colour for button icons (Luke Dashjr)
 2014-12-27 19:16:03 +01:00
Luke Dashjr 9b7d3fb165 Adopt style colour for button icons 2014-12-27 19:04:49 +01:00
Wladimir J. van der Laan a39aa74a8d
Merge pull request #5547 
de779b3 [Qt] new icon for the debug window (Jonas Schnelli)
 2014-12-27 16:21:33 +01:00
jtimon 87fb31086d Move UndoWriteToDisk() and UndoReadFromDisk() to anon namespace 2014-12-27 16:01:31 +01:00
jtimon 937ba572d0 MOVEONLY: CBlockUndo from main.h to undo.h 2014-12-27 16:01:31 +01:00
jtimon e035c6a737 Decouple CBlockUndo from CDiskBlockPos 2014-12-27 16:01:31 +01:00
jtimon d7621ccf9d Decouple miner.o and txmempool.o from CTxUndo 2014-12-27 16:01:12 +01:00
jtimon c444c620c6 Decouple CCoins from CTxInUndo 2014-12-27 15:46:09 +01:00
Jonas Schnelli de779b307b [Qt] new icon for the debug window 2014-12-27 12:35:38 +01:00
Jonas Schnelli 1f670846f7 [Docs] clean up assets-attributen.md 
- Make sure it represents the current state
 2014-12-27 12:28:34 +01:00
Gregory Maxwell a094b3d973 Remove bitnodes.io from dnsseeds. 
I'm not comfortable with retaining this entry.
 2014-12-27 01:38:47 -08:00
Wladimir J. van der Laan 0f2308cf7c
Merge pull request #5272 
13f9031 init: minor parameter interaction updates (Philip Kaufmann)
 2014-12-27 05:41:13 +01:00
Wladimir J. van der Laan a3bd5d7d82
Merge pull request #5533 
a15dba5 en: Avoid ambiguous language regarding when transactions confirm (Luke Dashjr)
 2014-12-27 05:01:09 +01:00
Wladimir J. van der Laan a992d600c5
Merge pull request #5536 
566c6cb gitian: attempt to fix tarball determinisim (Cory Fields)
 2014-12-27 04:11:18 +01:00
Wladimir J. van der Laan 3c9daa2f24
Merge pull request #5541 
d78f0da Fix CScriptID(const CScript& in) in empty script case (Peter Todd)
 2014-12-27 04:06:48 +01:00
Peter Todd d78f0dafd5
Fix CScriptID(const CScript& in) in empty script case 
Previously an empty script wouldn't be hashed, and CScriptID would be
assigned the incorrect value of 0 instead. This bug can be seen in the
RPC decodescript command:

    $ btc decodescript ""
    {
        "asm" : "",
        "type" : "nonstandard",
        "p2sh" : "31h1vYVSYuKP6AhS86fbRdMw9XHieotbST"
    }

Correct output:

    $ btc decodescript ""
    {
        "asm" : "",
        "type" : "nonstandard",
        "p2sh" : "3J98t1WpEZ73CNmQviecrnyiWrnqRhWNLy"
    }
 2014-12-25 03:18:40 -05:00
Eric R. Schulz 2c14d1532f bitcoin-tx: Add test case for signing a tx 2014-12-24 01:56:28 +00:00
Cory Fields 566c6cb8a2 gitian: attempt to fix tarball determinisim 2014-12-23 19:43:27 -05:00
Luke Dashjr a15dba5dff en: Avoid ambiguous language regarding when transactions confirm 2014-12-23 22:07:10 +00:00
Wladimir J. van der Laan 4312c8fc18
Merge pull request #5512 
dd14a0e docs: update gitian building docs (Cory Fields)
 2014-12-23 14:16:38 +01:00
Wladimir J. van der Laan 844ace95de
Merge pull request #5507 
c907704 DOS: Respect max per-peer blocks in flight limit (Adam Weiss)
 2014-12-23 12:32:47 +01:00
Wladimir J. van der Laan 055f3ae9aa
Merge pull request #5481 
6484930 Apply AreSane() checks to the fees from the network. (Gregory Maxwell)
 2014-12-23 12:29:33 +01:00
Wladimir J. van der Laan d01bcc446e
Merge pull request #5485 
aa279d6 Enforce minRelayTxFee on wallet created tx and add a maxtxfee option. (Gregory Maxwell)
 2014-12-23 12:12:05 +01:00
Wladimir J. van der Laan 4406c3e0f4
Merge pull request #5459 
3497022 Reject headers that build on an invalid parent (Pieter Wuille)
 2014-12-23 11:54:07 +01:00
Wladimir J. van der Laan 66ef824a9f
Merge pull request #5517 
39c8099 contrib: make github-merge require signing (Wladimir J. van der Laan)
 2014-12-23 11:28:08 +01:00
Everett Forth 7c5dd60306 Adding RPC tests for the following wallet related calls: getbalance, 
listsinceblock, listtransactions, listlockunspent, listaccounts
listaddressgroupings
 2014-12-23 02:27:17 -08:00