Gavin Andresen
c429f2b062
Merge pull request #2114 from sipa/strictstrict
...
Make IsCanonicalScript() check the hash type more thoroughly
2013-01-23 07:08:55 -08:00
Gavin Andresen
5a4af8f71f
Merge pull request #2167 from Diapolo/Qt_laa_flag
...
enable GCC large address aware linker flag (Windows only)
2013-01-23 07:00:24 -08:00
Gavin Andresen
a337505bd7
Merge pull request #2192 from mikehearn/notfoundmsg
...
Add a notfound message to getdata.
2013-01-23 06:48:57 -08:00
Gavin Andresen
1a2e45d8d5
Merge pull request #2188 from TheBlueMatt/bloom
...
Send transactions after a CMerkleBlock when asked for it in an inv.
2013-01-23 06:48:17 -08:00
Gavin Andresen
ea0a2b18f2
Merge pull request #2193 from Diapolo/Qt_parseBitcoinURI
...
Bitcoin-Qt: extend parseBitcoinURI() pre-check
2013-01-21 13:58:31 -08:00
Gavin Andresen
0d89669fe9
Merge pull request #2179 from gavinandresen/osx_codesign
...
Update mac packaging tool to create code-signed .app packages
2013-01-21 13:53:15 -08:00
Gavin Andresen
5fca58cb8e
Merge pull request #2190 from sipa/fixgenesis
...
Bugfix + simplify special case for genesis
2013-01-21 10:07:46 -08:00
Gavin Andresen
db8ca3fc2e
Code-signing certificates (no private keys) from Apple and Comodo
2013-01-18 10:08:28 -05:00
Gavin Andresen
33b377a016
Port macdeployqtplus to OSX 10.8
...
Use 'osascript' to run AppleScript, instead of using (broken-in-10.8)
python appscript package.
And added support for code-signing the .app bundle, to make OSX's
GateKeeper happy.
2013-01-18 10:08:28 -05:00
Gavin Andresen
2c7847349d
Merge pull request #2149 from sipa/fixtxoutrpc
...
Make output of gettxout RPC more consistent
2013-01-17 18:42:57 -08:00
Gavin Andresen
0e31ae9818
Merge pull request #2060 from sipa/parallel
...
Parallel script verification
2013-01-17 16:58:58 -08:00
Gavin Andresen
91f70a75da
Merge pull request #1795 from TheBlueMatt/bloom
...
Bloom filters
2013-01-17 10:04:08 -08:00
Gavin Andresen
5f04881618
Fix clang warnings
2013-01-15 17:27:29 -05:00
Gavin Andresen
c83c3cbe97
Merge pull request #2172 from Diapolo/init_messages
...
make database init messages more valuable
2013-01-14 12:49:42 -08:00
Gavin Andresen
e4f2b6b08f
Merge pull request #2159 from petertodd/display-nlocktime-correctly
...
Display tx nLockTime correctly when set to block #
2013-01-14 12:06:07 -08:00
Gavin Andresen
9980d118ee
Merge pull request #2129 from gmaxwell/wallet_less_frequent_fees
...
If the prio. will be enough after the next block don't force fees. [wallet]
2013-01-14 12:05:06 -08:00
Gavin Andresen
1eca3a0f0d
Merge branch 'macdeployqt_fix' of git://github.com/themighty1/bitcoin
2013-01-14 14:58:08 -05:00
Gavin Andresen
1b72229797
Merge pull request #2161 from sipa/noclient
...
Remove fClient
2013-01-14 11:41:19 -08:00
Gavin Andresen
dd46c88f2f
Merge pull request #2099 from gavinandresen/blkfile_upgrade
...
Upgrading to 0.8: re-use blkNNNN.dat files.
2013-01-14 11:37:12 -08:00
Gavin Andresen
40e31fd373
Merge pull request #2142 from gavinandresen/utilprint
...
OutputDebugStringF code cleanup
2013-01-14 11:36:48 -08:00
Gavin Andresen
7a08ee7c6d
Merge branch 'devprocess'
2013-01-14 14:32:01 -05:00
Gavin Andresen
b67b9e7077
Update development process README to reflect current reality
2013-01-14 14:31:10 -05:00
Gavin Andresen
ee3374234c
OutputDebugStringF code cleanup
...
Initialize the OutputDebugStringF mutex and file pointer using
boost::call_once, to be thread-safe.
Make the return value of OutputDebugStringF really be the number of
characters written (*printf() semantics).
Declare the fReopenDebugLog flag volatile, since it is changed from
a signal handler.
And don't declare OutputDebugStringF() as inline.
2013-01-01 17:12:30 -05:00
Gavin Andresen
567128a345
Merge pull request #2133 from Diapolo/init_strings
...
update 2 command-line parameter help messages
2012-12-31 15:06:08 -08:00
Gavin Andresen
23826f1b7f
Merge pull request #2116 from sipa/importrescanbool
...
Convert fRescan argument to importprivkey to bool
2012-12-21 06:30:53 -08:00
Gavin Andresen
6940626d08
Merge pull request #2112 from fanquake/typos
...
Fix two typos in main.h
2012-12-18 09:53:30 -08:00
Gavin Andresen
f4445f9982
Upgrading to 0.8: re-use blkNNNN.dat files.
2012-12-16 12:23:59 -05:00
Gavin Andresen
5fe3f4652e
Merge pull request #2097 from Diapolo/fix_merges
...
fix small stuff related to the recent merge-wave
2012-12-12 10:42:26 -08:00
Gavin Andresen
51dc438942
Merge pull request #2080 from mcassano/importprivkey_rescan_false
...
add rescan bool to importprivkey to control whether to do a rescan after import
2012-12-12 09:34:24 -08:00
Gavin Andresen
278a09a6c6
Merge pull request #2095 from al42and/upnp
...
OptionsModel now has MapPortUPnP=false if UPNP is not supported
2012-12-12 09:31:24 -08:00
Gavin Andresen
8a7277a578
Merge pull request #2003 from alexanderkjeldaas/documented-locking-part-2
...
Documented locking part 1+2
2012-12-12 09:27:35 -08:00
Gavin Andresen
50894e4fd4
Merge pull request #2064 from petertodd/ipv6-doc-polarity
...
Replace text on how to enable IPv6 with disable
2012-12-12 09:23:55 -08:00
Gavin Andresen
d339da70e5
Merge pull request #1825 from roques/bignum2
...
Bignum2
2012-12-12 09:23:16 -08:00
Gavin Andresen
5bd5d6c45c
Merge pull request #1940 from grimd34th/patch-1
...
Add NATIVE_WINDOWS
2012-12-12 09:20:46 -08:00
Gavin Andresen
095b06cfae
Merge pull request #2073 from grimd34th/patch-3
...
Update src/makefile.mingw
2012-12-12 09:19:26 -08:00
Gavin Andresen
a9e055a1ca
Merge pull request #2048 from jgarzik/no-checkpoints
...
Add "checkpoints" option, to permit disabling of checkpoint logic.
2012-12-12 09:18:00 -08:00
Gavin Andresen
78504bb04f
Merge pull request #1861 from jgarzik/coinlock
...
Add new RPC "lockunspent", to prevent spending of selected outputs
2012-12-12 09:15:43 -08:00
Gavin Andresen
043a8fb98d
Merge pull request #2059 from sipa/benchmark
...
Add -benchmark for reporting block processing times
2012-12-12 09:14:52 -08:00
Gavin Andresen
dbd5bb8039
Merge pull request #2062 from sipa/nocoins
...
Reconstruct coins/ database when missing
2012-12-12 09:11:36 -08:00
Gavin Andresen
8b83e2fc2e
Merge pull request #2074 from sipa/minor
...
Two minor inconvenience fixes
2012-12-12 09:10:44 -08:00
Gavin Andresen
59b8a869ab
Compile c/objective-c code max compatiblity when RELEASE
2012-12-12 11:31:29 -05:00
Gavin Andresen
5d32d3f8cd
Checkpoint at first 25-btc-reward block (210,000)
2012-12-10 09:53:22 -05:00
Gavin Andresen
85887020dc
Merge pull request #2055 from redshark1802/master
...
more specific build instructions for Ubuntu
2012-12-04 07:18:04 -08:00
Gavin Andresen
aaef016a07
Merge pull request #2037 from luke-jr/printpriority
...
Allow -printpriority without -debug
2012-11-30 16:16:59 -08:00
Gavin Andresen
edf6ba2690
Merge pull request #2031 from gavinandresen/scriptcomment
...
Add assert and comment for subtle pay-to-script-hash logic
2012-11-21 13:02:40 -08:00
Gavin Andresen
a91efb2d8d
Add assert and comment for subtle pay-to-script-hash logic
2012-11-21 13:58:10 -05:00
Gavin Andresen
e45d39f9ee
Merge pull request #2009 from sipa/fixmove
...
Prevent RPC 'move' from deadlocking
2012-11-16 08:09:41 -08:00
Gavin Andresen
a77bcaddbf
Merge pull request #1935 from runeksvendsen/master
...
Add script to contrib/ that verifies authenticity of binaries hosted on SourceForge
2012-10-29 12:59:28 -07:00
Gavin Andresen
ae8fc19788
Merge branch 'rawtx_p2sh'
2012-10-29 15:49:46 -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
Gavin Andresen
eb49457ff2
0.7.1 release notes
2012-10-09 13:22:09 -04:00
Gavin Andresen
1d1f32d16d
Bump versions for 0.7.1 release
2012-10-09 12:37:35 -04:00
Gavin Andresen
de038acd96
Fix bad merge, pszDataDir duplication
2012-10-09 12:28:00 -04:00
Gavin Andresen
673021410f
Merge branch 'wallet_exceptions' of github.com:gavinandresen/bitcoin-git
2012-10-09 12:14:26 -04:00
Gavin Andresen
cf64347d70
Merge branch 'crash_at_exit' of github.com:gavinandresen/bitcoin-git
2012-10-09 12:10:18 -04:00
Gavin Andresen
d0b3e77a08
Don't try to verify a non-existent wallet.dat
2012-10-08 17:46:46 -04:00
Gavin Andresen
eed1785f70
Handle corrupt wallets gracefully.
...
Corrupt wallets used to cause a DB_RUNRECOVERY uncaught exception and a
crash. This commit does three things:
1) Runs a BDB verify early in the startup process, and if there is a
low-level problem with the database:
+ Moves the bad wallet.dat to wallet.timestamp.bak
+ Runs a 'salvage' operation to get key/value pairs, and
writes them to a new wallet.dat
+ Continues with startup.
2) Much more tolerant of serialization errors. All errors in deserialization
are reported by tolerated EXCEPT for errors related to reading keypairs
or master key records-- those are reported and then shut down, so the user
can get help (or recover from a backup).
3) Adds a new -salvagewallet option, which:
+ Moves the wallet.dat to wallet.timestamp.bak
+ extracts ONLY keypairs and master keys into a new wallet.dat
+ soft-sets -rescan, to recreate transaction history
This was tested by randomly corrupting testnet wallets using a little
python script I wrote (https://gist.github.com/3812689 )
2012-10-08 17:46:45 -04:00
Gavin Andresen
8d5f461cb6
Handle incompatible BDB environments
...
Before, opening a -datadir that was created with a new
version of Berkeley DB would result in an un-caught DB_RUNRECOVERY
exception.
After these changes, the error is caught and the user is told
that there is a problem and is told how to try to recover from
it.
2012-10-08 17:25:17 -04:00
Gavin Andresen
c2bb42168b
Merge branch 'BDB_DOWNGRADE'
2012-10-08 17:18:17 -04:00
Gavin Andresen
e4954b1297
Handle incompatible BDB environments
...
Before, opening a -datadir that was created with a new
version of Berkeley DB would result in an un-caught DB_RUNRECOVERY
exception.
After these changes, the error is caught and the user is told
that there is a problem and is told how to try to recover from
it.
2012-10-08 15:51:59 -04:00
Gavin Andresen
cac6b389d1
Avoid crashes at shutdown due to printf() in global destructors.
2012-10-04 16:35:08 -04:00
Gavin Andresen
0547b02af7
Merge branch '2012_09_fixwformat' of github.com:laanwj/bitcoin
2012-10-01 16:52:42 -04:00
Gavin Andresen
d2cc6f489c
Merge branch 'master' of github.com:runeksvendsen/bitcoin
2012-10-01 16:51:24 -04:00
Gavin Andresen
da6e9fe634
Merge pull request #1893 from kjj2/issue1884
...
Issue 1884: Add a backup warning to the encryptwallet RPC command
2012-10-01 13:40:48 -07:00
Gavin Andresen
00a757375c
Merge branch '2012_09_base58tests' of github.com:laanwj/bitcoin
2012-10-01 11:22:38 -04:00
Gavin Andresen
d6c4400d57
Compile/link Bitcoin-Qt.app with -pthread
2012-09-21 15:42:38 -04:00
Gavin Andresen
f2b066da70
Update gitignore and Makefiles for build.h move from src/ to src/obj
2012-09-20 10:28:13 -04:00
Gavin Andresen
6cbae37667
Merge branch 'testdata' of git://github.com/TheBlueMatt/bitcoin
2012-09-18 19:22:40 -04:00
Gavin Andresen
8b371316c5
Merge branch 'master' of github.com:bitcoin/bitcoin
2012-09-18 12:20:01 -04:00
Gavin Andresen
8f09e4cac4
Give makefiles 'test' and 'check' targets to compile and run unit tests
2012-09-18 12:18:51 -04:00
Gavin Andresen
085d9c75f4
Reset release notes for release-after-0.7.0
2012-09-18 11:33:04 -04:00
Gavin Andresen
a0971337d0
Merge branch 'refactor_times' of git://github.com/luke-jr/bitcoin
2012-09-18 10:59:31 -04:00
Gavin Andresen
5add0b0d0f
Bump client version to 0.7.0.99 now that 0.7.0 release is final.
2012-09-18 10:58:22 -04:00
Gavin Andresen
0a4e67afad
Bump client version number for 0.7.0rc3
2012-09-12 14:07:22 -04:00
Gavin Andresen
b3295cd283
Merge pull request #1822 from sipa/fix_ipv6_rpc
...
Do not abort if RPC listening for IPv6 fails
2012-09-12 11:02:40 -07:00
Gavin Andresen
d078739965
Merge branch 'bip30_harder' of git://github.com/gmaxwell/bitcoin
2012-09-12 10:20:46 -04:00
Gavin Andresen
1913b6e2fc
Fix double-paren typo
2012-09-06 16:29:59 -04:00
Gavin Andresen
3c28b335af
Minor build documentation fix
2012-09-06 16:27:39 -04:00
Gavin Andresen
004fa1441c
Merge branch 'master' of github.com:bitcoin/bitcoin
2012-09-06 16:27:08 -04:00
Gavin Andresen
4dc89fa875
Build doc updates
2012-09-06 15:51:16 -04:00
Gavin Andresen
ace35a1997
Fix mac .dmg packager for latest macports qt4
2012-09-05 17:54:37 -04:00
Gavin Andresen
8788221761
Bump version number for 0.7.0rc2
2012-09-05 12:38:37 -04:00
Gavin Andresen
aeea5e2a2d
Minor documentation updates
2012-09-05 12:38:37 -04:00
Gavin Andresen
91c218a1cb
Merge branch 'testnet_alert' of git://github.com/gavinandresen/bitcoin-git
2012-09-05 11:38:38 -04:00
Gavin Andresen
21327ebe93
Update gitian build setup notes
2012-09-05 11:37:33 -04:00
Gavin Andresen
eaf00a3a5d
Merge pull request #1774 from luke-jr/refactor_times
...
Bugfix: Require OrderedTxItems to provide properly scoped accounting entry list
2012-09-02 16:47:58 -07:00
Gavin Andresen
286dbba2d2
Give testnet it's own alert key.
2012-08-28 17:13:11 -04:00
Gavin Andresen
f35c6c4fb9
Refactor: move alert code from main to alert.cpp/h
2012-08-28 17:04:54 -04:00
Gavin Andresen
03fa53a640
Version numbers -> 0.7.0
2012-08-27 14:20:56 -04:00
Gavin Andresen
fde5c34bd8
Merge branch 'alert_fix' of git://github.com/gavinandresen/bitcoin-git
2012-08-27 12:39:13 -04:00
Gavin Andresen
ef8e821cf2
Fix compiler warning on mac
2012-08-27 12:37:35 -04:00
Gavin Andresen
8cd98a9a26
Merge branch 'bugfix_gitian' of git://github.com/luke-jr/bitcoin
2012-08-27 11:52:56 -04:00
Gavin Andresen
ea2fda46c3
Special-case the last alert for alert-key-compromised case
...
Hard-code a special nId=max int alert, to be broadcast if the
alert key is ever compromised. It applies to all versions, never
expires, cancels all previous alerts, and has a fixed message:
URGENT: Alert key compromised, upgrade required
Variations are not allowed (ignored), so an attacker with
the private key cannot broadcast empty-message nId=max alerts.
2012-08-27 10:22:57 -04:00
Gavin Andresen
d5a52d9b3e
Alert system DoS prevention
...
This fixes two alert system vulnerabilities found by
Sergio Lerner; you could send peers unlimited numbers
of invalid alert message to try to either fill up their
debug.log with messages and/or keep their CPU busy
checking signatures.
Fixed by disconnecting/banning peers if they send 10 or more
bad (invalid/expired/cancelled) alerts.
2012-08-26 17:08:18 -04:00
Gavin Andresen
772351b0d5
Merge branch '2012_08_progressbarwin' of git://github.com/laanwj/bitcoin
2012-08-25 11:14:11 -04:00
Gavin Andresen
9db9642db4
Merge branch 'nozeroout' of git://github.com/sipa/bitcoin
2012-08-25 11:05:59 -04:00
Gavin Andresen
b9c078ea96
Merge branch 'checkpoint'
2012-08-25 11:05:24 -04:00