BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
7,700 Commits 1 Branch 186 Tags 48 MiB
Commit Graph

7700 Commits

Author SHA1 Message Date
Wladimir J. van der Laan f55c5e9749
Merge pull request #5349 
0125988 Implement test for merkle tree malleability in CPartialMerkleTree (Pieter Wuille)
 2015-01-02 18:06:52 +01:00
Wladimir J. van der Laan c986972ad7
Merge pull request #5476 
73caf47 Display time offset in the debug window's Peers tab (Pavel Janík)
26a6bae Add time offset to getpeerinfo output (Pavel Janík)
 2015-01-02 17:54:21 +01:00
Wladimir J. van der Laan 40d65eb66d
Merge pull request #5580 
1b178a7 Bugfix: ConnectBlock: In case the genesis block gets in with fJustCheck, behave correctly (Luke Dashjr)
228d238 Make CCoinsViewCache's copy constructor private (Luke Dashjr)
 2015-01-02 17:35:45 +01:00
Wladimir J. van der Laan 269d8ba0d2
Remove declaration of no longer existent CheckWork 
Also make ProcessBlockFound static as it is not used outside
miner.cpp.

Alternative implementation of #5549.
 2015-01-02 17:30:00 +01:00
Wladimir J. van der Laan 7c2dea4e92
Merge pull request #5569 
0d50c2f dmg: fix deterministic dmg creation and docs (Cory Fields)
 2015-01-02 17:12:58 +01:00
Wladimir J. van der Laan fe39ce6b23
Merge pull request #5583 
643415a [Qt] update a translation string and argument counts (Philip Kaufmann)
 2015-01-02 11:18:28 +01:00
Wladimir J. van der Laan 48ea5e0ea0
Merge pull request #5586 
d57b303 depends: fix major regression after d546191dc. (Cory Fields)
 2015-01-02 11:13:45 +01:00
Wladimir J. van der Laan edbc9045cb
Bump project-wide COPYRIGHT_YEAR to 2015 
There is still a redundancy here between configure.ac and
clientversion.h.
 2015-01-02 10:53:13 +01:00
Wladimir J. van der Laan e6df2bb48f Remove redundant copyright notices from README files 
The normative place for these for the entire project is COPYING,
and the main README already has a MIT license section.
 2015-01-02 10:46:23 +01:00
Wladimir J. van der Laan 9adfacdb8b
Merge pull request #5551 
dd3f697 Use real text rather than image-rendered text for unit selector (Luke Dashjr)
 2015-01-02 10:04:48 +01:00
Cory Fields d57b303e1e depends: fix major regression after d546191dc. 
Broken hash logic caused all depends on some platforms (osx at least) to end up
with the same build-id. Without this fix, nothing will be rebuilt when recipes
or dependencies change.
 2014-12-31 13:20:24 -05:00
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
Philip Kaufmann 643415aade [Qt] update a translation string and argument counts 2014-12-31 12:03:00 +01: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
Luke Dashjr 1b178a7f96 Bugfix: ConnectBlock: In case the genesis block gets in with fJustCheck, behave correctly 2014-12-31 03:28:05 +00:00
Luke Dashjr 228d238525 Make CCoinsViewCache's copy constructor private 
It is easily confused with CCoinsViewCache(CCoinsView*), which creates a sub-cache, but instead of creating a sub-cache, the copy constructor would copy the original and use that original's base, defeating the intended isolation.
 2014-12-31 03:19:24 +00: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
Cory Fields 0d50c2fd81 dmg: fix deterministic dmg creation and docs 2014-12-30 02:47:38 -05: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
Luke Dashjr dd3f69736a Use real text rather than image-rendered text for unit selector 
The width of each unit is measured to set a fixed width for the widget, and the color is set to match the other status widgets.
 2014-12-29 09:59:54 +00: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