Gavin Andresen
ae8fc19788
Merge branch 'rawtx_p2sh'
2012-10-29 15:49:46 -04:00
Gregory Maxwell
155bdd90b9
Merge pull request #1966 from TheBlueMatt/leveldbmakefile
...
Build script fixes
2012-10-29 12:48:55 -07:00
Matt Corallo
38fe2e6a68
Add missing calls to ranlib in Windows makefiles
2012-10-29 15:43:18 -04:00
Matt Corallo
325a064c68
Upgrade to Qt 4.8.3 (because 4.8.2 was removed from qt repos?)
2012-10-29 15:43:18 -04:00
Matt Corallo
f53b125507
Fix linux-mingw makefile's leveldb build by setting CXX.
2012-10-29 15:43:17 -04:00
Matt Corallo
3b4f8ad71d
Use && instead of ; in leveldb calls to makefile.
2012-10-29 15:43:17 -04:00
Gavin Andresen
34226be7a8
New createmultisig rpc command
...
This is to support the signrawtransaction API call; given the public
keys involved in a multisig transaction, this gives back the redeemScript
needed to sign it.
2012-10-29 13:34:35 -04:00
Gavin Andresen
03346a61b1
Add redeemScript to listunspent output and signrawtransaction input
...
signrawtransaction was unable to sign pay-to-script-hash inputs
when given the list of private keys to use. With this commit
you can provide the p2sh redemption script in the list of
inputs.
2012-10-29 13:34:35 -04:00
Gavin Andresen
2d43f88e1f
Tests for raw transactions argument checking
2012-10-29 13:34:35 -04:00
Gavin Andresen
c4d884e20e
No need for test fixture now that multisig is enabled on main network.
2012-10-29 13:34:35 -04:00
Pieter Wuille
c13f5dbecf
Merge pull request #1710 from sipa/dosp2sh
...
Remove P2SH transition code: P2SH violations may cause DoS trigger
2012-10-29 03:28:49 -07:00
Pieter Wuille
28982cc9dc
Remove P2SH transition code: P2SH violations may cause DoS trigger
2012-10-29 00:41:39 +01:00
Pieter Wuille
bb790aa24d
First flush block tree, then coin set
...
As the coinset data refers to the best block, stored in the block
tree. Flushing the coin set first can cause inconsistencies if
the process gets killed in between.
2012-10-25 20:47:17 +02:00
tucenaber
3026baaa7c
Added checks for null pointers in Shutdown
...
Estetics
2012-10-25 20:45:38 +02:00
Pieter Wuille
344620e953
Merge pull request #1904 from laanwj/2012_10_remove_getorder
...
remove "checkorder" P2P command
2012-10-25 11:41:22 -07:00
Pieter Wuille
e74d0ab675
Merge pull request #1899 from Diapolo/proxy_optionsmodel
...
make optionsmodel query real proxy state for ::data()
2012-10-25 11:33:59 -07:00
Pieter Wuille
66444558a5
Merge pull request #1953 from gmaxwell/createnewblock-race
...
Fixes a race condition in CreateNewBlock and a future null deref on testnet.
2012-10-25 11:30:51 -07:00
Wladimir J. van der Laan
1f7c5c5a3e
Merge pull request #1926 from laanwj/2012_10_maindummybounds
...
Fix out-of-bounds read in main (issue #1924 )
2012-10-25 06:12:10 -07:00
Wladimir J. van der Laan
7a1786084d
Merge pull request #1956 from laanwj/2012_10_prerelease_warning
...
Show warning when using prerelease version
2012-10-25 05:52:55 -07:00
Pieter Wuille
2e9e6641e1
Merge pull request #1955 from gmaxwell/gbt_paramfix
...
Don't force getblocktemplate to have a parameter.
2012-10-25 05:37:51 -07:00
Wladimir J. van der Laan
c98a0a432e
Merge pull request #1959 from Diapolo/eventFilter_askpassphrasedlg
...
ensure AskPassphraseDialog::eventFilter forwards events
2012-10-25 03:21:35 -07:00
Philip Kaufmann
83a3fb81f3
ensure AskPassphraseDialog::eventFilter forwards events
...
- instead of "return false;" use "return QDialog::eventFilter(object,
event);" to harmonize this event filter with our default behaviour
- remove orphan spaces found while editting the files
2012-10-25 11:52:34 +02:00
Wladimir J. van der Laan
2d53ba2c69
Merge pull request #1925 from Diapolo/gcc-hardening
...
GCC hardening for Bitcoin-Qt
2012-10-25 01:07:19 -07:00
Wladimir J. van der Laan
62e21fb5d0
Show warning when using prerelease version
...
Implements #1948
- Add macro `CLIENT_VERSION_IS_RELEASE` to clientversion.h
- When running a prerelease (the above macro is `false`):
- In UI, show an orange warning bar at the top. This will be used for other
warnings (and alerts) as well, instead of the status bar.
- For `bitcoind`, show the warning in the "errors" field in `getinfo`
response.
2012-10-25 07:33:45 +02:00
Gregory Maxwell
3beac9837f
Don't force getblocktemplate to have a parameter.
...
This looks like it was just a munged merge when ultraprune
was committed.
2012-10-24 12:39:46 -04:00
Pieter Wuille
55913c9971
Merge pull request #1947 from centromere/freebsd_cpu_fix
...
Fixed 100% CPU utilization problem on FreeBSD 9
2012-10-24 02:15:54 -07:00
Wladimir J. van der Laan
4fbad9124e
Fix out-of-bounds read noticed by Ricardo Correia
...
Sizeof() returned the size of a pointer instead of the size of the buffer.
Fixes issue #1924 .
2012-10-24 08:26:50 +02:00
Gregory Maxwell
faff50d129
Fixes a race condition in CreateNewBlock and a future null deref on testnet.
...
CreateNewBlock was reading pindexBest at the start before taking the lock
so it was possible to have the the block content not match the prevheader
and this can also trigger a newly added assert in ConnectBlock.
I noticed this during a code review after twobitcoins reported that ab91bf39
(BIP30 for all blocks) could cause a null dereference on a modified node
that mined during the IBD, or on testnet when it reached heights 91842 and
91880 due to CreateNewBlock calling ConnectBlock with pindex->phashBlock NULL.
2012-10-24 02:13:03 -04:00
Pieter Wuille
675a39fc4f
Merge pull request #1942 from Diapolo/rem_dup_txdb_h
...
fix a double inclusion of txdb.h in bitcoin-qt.pro
2012-10-23 15:08:24 -07:00
Jeff Garzik
16eec89042
Merge pull request #1949 from sipa/bugfix_maturity
...
Ultraprune bugfixes
2012-10-22 17:39:16 -07:00
Pieter Wuille
4afc0b5411
Bugfix: actually use CCoinsViewMemPool
2012-10-23 01:43:33 +02:00
Pieter Wuille
c2ed184f98
Added some comments
...
Some clarifications after a code review by Mike Hearn.
2012-10-23 00:27:17 +02:00
Pieter Wuille
1e64c2d585
Bugfix: off-by-one in priority calculation
2012-10-23 00:23:39 +02:00
Pieter Wuille
9e957fb3b1
Bugfix: add missing fee check
2012-10-23 00:23:39 +02:00
Pieter Wuille
56424040a4
Bugfix: off-by-one error in coinbase maturity check
2012-10-23 00:23:39 +02:00
Alex
39ad0aa692
Fixed 100% CPU utilization problem on FreeBSD 9
2012-10-22 08:37:17 -04:00
Gregory Maxwell
2ef15697f8
Merge pull request #1939 from sipa/bugfix_zerobalance
...
Bugfix: do not mark all future coins spent
2012-10-21 16:20:04 -07:00
Pieter Wuille
ef0ae25c2b
Merge pull request #1910 from Diapolo/block_chain_typo
...
change blockchain -> block chain (spelling)
2012-10-21 12:36:01 -07:00
Philip Kaufmann
729b180686
change blockchain -> block chain (spelling)
...
- Wiki says "block chain" is correct ;)
- remove some unneeded spaces I found in the source, while fixing the spelling
2012-10-21 21:32:25 +02:00
Philip Kaufmann
6b08099d7b
fix a double inclusion of txdb.h in bitcoin-qt.pro
2012-10-21 21:22:39 +02:00
Pieter Wuille
d44f1ea394
Merge pull request #1941 from Diapolo/rem_initMsg_main
...
remove init messages from ThreadImport()
2012-10-21 12:22:29 -07:00
Philip Kaufmann
039bcbf12d
remove init messages from ThreadImport()
...
- remove uiInterface.InitMessage() calls from ThreadImport(), as Qt
doesn't like them getting called out of it's main thread and because the
thread will continue to run after the GUI was loaded
2012-10-21 21:16:52 +02:00
Pieter Wuille
80fe60959d
Tab instead of 4 spaces in makefile.mingw
2012-10-21 16:10:01 +02:00
Pieter Wuille
ddba582377
Bugfix: do not mark all future coins spent
2012-10-21 15:19:19 +02:00
Gregory Maxwell
d12b694106
Merge pull request #1938 from sipa/v0799
...
Update version numbers to 0.7.99
2012-10-21 03:12:25 -07:00
Pieter Wuille
fcfa7a588e
Update version numbers to 0.7.99
2012-10-21 12:10:08 +02:00
Gregory Maxwell
67e2c8a40a
Merge pull request #1916 from jgarzik/caddrdb-bug
...
Fix: CAddrMan: verify pchMessageStart file marker, before reading address data
2012-10-20 15:06:25 -07:00
Pieter Wuille
f50fb5470b
Merge pull request #1936 from sipa/morehashwriter
...
Use CHashWriter also in SignatureHash(), and for message signing
2012-10-20 14:53:43 -07:00
Pieter Wuille
cf9b49fa50
Merge pull request #1677 from sipa/ultraprune
...
Ultraprune: use a pruned-txout-set database for block validation
2012-10-20 14:49:33 -07:00
Pieter Wuille
4ca60bba5c
Remove BDB block database support
2012-10-20 23:08:57 +02:00