highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 15:50:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,426 Commits 8 Branches 346 Tags
802bc904ba102c19631aa2aad9659df74fe0e07e
Commit Graph

2426 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luke Dashjr
802bc904ba Tree-Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/base58.h
	src/script.h
 2012-08-26 22:45:20 +00:00
Luke Dashjr
2eaeb17fe1 Merge branch '0.4.x' into 0.5.x 2012-08-26 22:44:23 +00:00
Luke Dashjr
01cc7bf0c5 Support sending to script (P2SH) addresses 
Upstream partials from 9e470585b3, e679ec969c, and 922e8e2929.
 2012-08-26 22:43:42 +00:00
Luke Dashjr
12217fb61d Merge branch '0.5.x' into 0.6.0.x 2012-08-26 22:20:34 +00:00
Luke Dashjr
cd76166b4b Merge commit '52153a6' into 0.6.0.x 
Conflicts:
	src/bitcoinrpc.cpp
 2012-08-26 22:20:26 +00:00
Luke Dashjr
680c3c8565 Merge commit '689b878' into 0.6.0.x 2012-08-26 22:19:46 +00:00
Luke Dashjr
4c063c11ff Merge commit '9adab76' into 0.6.0.x 
Conflicts:
	src/main.cpp
 2012-08-26 22:19:14 +00:00
Luke Dashjr
0eca21c5fa Merge commit 'd710ed5' into 0.6.0.x 2012-08-26 22:18:26 +00:00
Luke Dashjr
cd24f37092 Merge commit 'b958999' into 0.6.0.x 
Conflicts:
	src/makefile.osx
	src/makefile.unix
 2012-08-26 22:17:35 +00:00
Luke Dashjr
7c08c1a5df Merge commit 'a259baa' into 0.6.0.x 2012-08-26 22:15:56 +00:00
Luke Dashjr
f498701444 Merge branch '0.4.x' into 0.5.x 2012-08-26 22:14:37 +00:00
Gavin Andresen
bfd2ddfc47 Checkpoint at block 185333 (and remove a couple of intermediate checkpoints) 2012-08-26 22:14:06 +00:00
Wladimir J. van der Laan
bfe7cc638d Override progress bar on platforms with segmented progress bars 
Windows & WindowsXP style have a problem with displaying the block progress.
Add a custom stylesheet as workaround, but only when one of those renderers is active,
otherwise leave the theme alone (issue #1071).
 2012-08-26 22:13:34 +00:00
Luke Dashjr
52153a6e08 Minimal adaptations to getmemorypool for BIP 34 
- As long as version 1 blocks are valid, provide them to getmemorypool clients (only)
- Include BIP 22 "height" key in getmemorypool output
 2012-08-26 21:51:41 +00:00
Luke Dashjr
689b878c33 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/main.cpp
 2012-08-26 21:10:06 +00:00
Gavin Andresen
2d57b561c2 Reject block.nVersion<=1 blocks if network has upgraded to version=2 
If 950 of the last 1,000 blocks are nVersion=2, reject nVersion=1
(or zero, but no bitcoin release has created block.nVersion=0) blocks
-- 75 of last 100 on testnet3.

This rule is being put in place now so that we don't have to go
through another "express support" process to get what we really
want, which is for every single new block to include the block height
in the coinbase.
 2012-08-26 21:07:08 +00:00
Gavin Andresen
9adab76e0a Block height in coinbase as a new block rule 
"Version 2" blocks are blocks that have nVersion=2 and
have the block height as the first item in their coinbase.
Block-height-in-the-coinbase is strictly enforced when
version=2 blocks are a supermajority in the block chain
(750 of the last 1,000 blocks on main net, 51 of 100 for
testnet). This does not affect old clients/miners at all,
which will continue producing nVersion=1 blocks, and
which will continue to be valid.
 2012-08-26 21:06:26 +00:00
Gavin Andresen
d710ed5b63 Add CBlock::CURRENT_VERSION and CTransaction::CURRENT_VERSION constants. 
Partial of upstream dae3e10a5a
 2012-08-26 21:02:57 +00:00
Matt Corallo
b958999af1 Work around a distcc bug where -MMD output isn't copied. 2012-08-26 20:44:40 +00:00
Philip Kaufmann
a259baa955 update some strings used as warning messages in sendcoinsdialog.cpp 2012-08-26 20:33:21 +00:00
Luke Dashjr
5ebc168006 Bugfix: Make USE_UPNP=- work with makefile.{linux-mingw,mingw,osx} too 2012-08-24 03:42:16 +00:00
Philip Kaufmann
f51b175e3c fix a compiler sign warning in OpenBlockFile() 2012-08-22 17:17:42 +00:00
Matt Corallo
94db8f97d4 Fix Win32 compiling of qt/test/uritests.cpp 2012-08-12 17:44:52 +00:00
Matt Corallo
4e56a62f72 Return !0 when qt tests fail. 2012-08-12 17:44:48 +00:00
Philip Kaufmann
08344c735f fix further spelling errors / remove a tab in the source 2012-08-12 17:41:24 +00:00
Luke Dashjr
06f4e33677 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:36:38 +00:00
Luke Dashjr
4fb6e53968 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	doc/unit-tests.txt
 2012-08-12 17:35:44 +00:00
Luke Dashjr
566f556c40 Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:34:23 +00:00
Luke Dashjr
8ddc257a4b Merge branch '0.4.x' into 0.5.x 2012-08-12 17:33:03 +00:00
Luke Dashjr
448f6b3d9b Bugfix: Correct English grammar regarding "'s" 2012-08-12 17:30:36 +00:00
Luke Dashjr
8911ac0b27 Bugfix: Use standard BTC unit in comments 2012-08-12 17:27:46 +00:00
Luke Dashjr
3171daef6c Bugfix: Fix a variety of misspellings 2012-08-12 17:22:48 +00:00
Luke Dashjr
cafa8f2879 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/key.h
	src/keystore.h
	src/net.h
	src/protocol.cpp
	src/qt/guiutil.h
	src/test/DoS_tests.cpp
 2012-08-12 17:19:48 +00:00
Luke Dashjr
89c5c381b7 Merge branch '0.5.x' into 0.6.0.x 2012-08-12 17:14:29 +00:00
Luke Dashjr
982f4fd301 Bugfix: Fix a variety of misspellings 2012-08-12 17:13:48 +00:00
Luke Dashjr
797d0b231b Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/net.cpp
 2012-08-12 17:02:38 +00:00
Luke Dashjr
9e98fe6f58 Bugfix: Fix a variety of misspellings 
(PARTIAL: Left out anything changing debug.log)
 2012-08-12 17:00:02 +00:00
Luke Dashjr
5951d9fe32 Merge branch 'bugfix_CNBerr' into 0.5.x 2012-08-12 16:40:59 +00:00
Luke Dashjr
9b1b1a06a1 Merge branch '0.4.x' into 0.5.x 2012-08-12 16:39:46 +00:00
Luke Dashjr
ae8ccfd24b Merge branch 'bugfix_CNBerr_daggy' into 0.4.x 2012-08-12 16:39:03 +00:00
Michael Ford
7543a5611b Typo 2012-07-26 03:37:12 +00:00
Stephane Glondu
0a9972bf1b Fix spelling of successfully 2012-07-26 00:41:56 +00:00
fanquake
895191b9a8 Typo 2012-07-26 00:39:46 +00:00
fanquake
b8dcb38b4e Fix Typo 2012-07-26 00:39:21 +00:00
fanquake
fb4dbbd188 Docs Tidy up 
(PARTIAL cherry pick)
 2012-07-22 23:38:26 +00:00
Luke Dashjr
ff4be740b5 Merge branch '0.5.x' into 0.6.0.x 2012-07-22 23:15:38 +00:00
Luke Dashjr
4f620dd0f0 Merge branch '0.4.x' into 0.5.x 2012-07-22 23:15:22 +00:00
Philip Kaufmann
ec9a3c04ed fix OpenSSL not written as proper noun in some comments 2012-07-22 22:09:49 +00:00
Philip Kaufmann
222ac2b12a re-size addressbookpage.ui to fix #1062 2012-07-22 22:08:49 +00:00
fanquake
5dc6e7067c Update a link 2012-07-22 21:52:41 +00:00