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
Wladimir J. van der Laan
0a5ce30bc1
Merge pull request #1915 from Diapolo/Qt5_compat_leftover
...
change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
2012-10-08 22:28:24 -07:00
Jeff Garzik
de2b9459bd
Merge pull request #1834 from jgarzik/kickblocks
...
P2P: Do not request blocks from peers with fewer blocks than us
2012-10-08 15:15:58 -07:00
Jeff Garzik
b855abb8db
Revert "Send 'mempool' P2P command at the start of each P2P session"
...
Fat-fingered on github, and merged this too early.
This reverts commit 22f9b06903
.
2012-10-08 18:14:15 -04:00
Jeff Garzik
56caa38a67
Merge pull request #1833 from jgarzik/mempool-query
...
Send 'mempool' P2P command at the start of each P2P session
2012-10-08 15:12:25 -07: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
Jeff Garzik
bd2e140571
CAddrMan: verify pchMessageStart file marker, before reading address data
...
This avoids the case where you read the address data, before noticing it is
the wrong network.
2012-10-08 13:41:57 -04:00
Philip Kaufmann
ada2a39691
change Q_WS_MAC -> Q_OS_MAC (Qt5 compatibility)
...
- I missed that one in my former pull
2012-10-07 18:50:03 +02:00
Pieter Wuille
43de64949c
Merge pull request #1859 from Diapolo/proxy_locks
...
add LOCK() for proxy related data-structures
2012-10-07 07:03:06 -07:00
Pieter Wuille
e996521390
Use fdatasync instead of fsync on supported platforms
2012-10-07 15:51:40 +02:00
Pieter Wuille
4e882b7960
Remove I2P support from netbase
...
I2P apparently needs 256 bits to store a fully routable address. Garlicat
requires a centralized lookup service to map the 80-bit addresses to fully
routable ones (as far as I understood), so that's not really usable in our
situation.
To support I2P routing and peer exchange for it, another solution is needed.
This will most likely imply a network protocol change, and extension of the
'addr' message.
2012-10-07 15:10:14 +02:00
Wladimir J. van der Laan
6032e4f4e7
get rid of strlcpy.h
...
Don't use hand-rolled string manipulation routine with a fixed
buffer in the bitcoin core, instead make use of c++ strings and boost.
2012-10-07 14:38:37 +02:00
Philip Kaufmann
95e625d235
fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cpp
...
- also includes the required bitcoinstrings.cpp update
2012-10-05 23:31:58 +02:00
Wladimir J. van der Laan
ee0b648536
Merge pull request #1906 from laanwj/2012_10_help_stdout
...
Send --help message to stdout i.s.o stderr
2012-10-05 11:24:09 -07:00
Wladimir J. van der Laan
a6be58d536
Merge pull request #1905 from laanwj/2012_10_startup_gui_error
...
When datadir missing, show messagebox instead of printing error to stderr
2012-10-04 22:28:44 -07:00
Pieter Wuille
39930ca6ae
Merge pull request #1908 from laanwj/2012_10_rpcerrors
...
Document RPC error codes
2012-10-04 17:17:53 -07:00
Gavin Andresen
cac6b389d1
Avoid crashes at shutdown due to printf() in global destructors.
2012-10-04 16:35:08 -04:00
Wladimir J. van der Laan
285746d3db
Add constants for HTTP status codes
2012-10-04 15:49:15 +02:00
Wladimir J. van der Laan
738835d7b8
Document RPC error codes
...
Replace all "magic values" in RPCError(...) by constants.
2012-10-04 15:49:15 +02:00
Wladimir J. van der Laan
61fd72695f
When datadir missing, show messagebox instead of printing error to stderr
2012-10-04 12:04:12 +02:00
Wladimir J. van der Laan
c0b130b79b
Merge pull request #1907 from laanwj/2012_10_translations
...
Translation update for 0.7.1
2012-10-04 01:49:25 -07:00
Philip Kaufmann
81bbef2609
add LOCK() for proxy related data-structures
...
- fix #1560 by properly locking proxy related data-structures
- update GetProxy() and introduce GetNameProxy() to be able to use a
thread-safe local copy from proxyInfo and nameproxyInfo
- update usage of GetProxy() all over the source to match the new
behaviour, as it now fills a full proxyType object
- rename GetNameProxy() into HaveNameProxy() to be more clear
2012-10-04 09:35:24 +02:00
Wladimir J. van der Laan
366944431b
Pull changed translations from transifex
...
There was also a new translation available, "ja" (Japanese), however
almost nothing was filled in yet, so I'm not including it for this release.
2012-10-04 08:18:12 +02:00
Wladimir J. van der Laan
f1e262c8e1
Translation update for 0.7.1
...
Also clarify translation process that the package `gettext` is needed to run string extractor.
2012-10-04 08:13:37 +02:00
Wladimir J. van der Laan
bb353618f1
Send --help message to stdout i.s.o stderr
...
This allows fun stuff such as `bitcoin --help | less`, and more
easy piping to files.
Looking at other tools such as bash, gcc, they all send their help
text to stdout.
2012-10-04 07:56:57 +02:00
Philip Kaufmann
7bc65ff108
move most explicit getters in optionsmodel to header
...
- is more consistent and saves quite some lines of code
2012-10-02 18:49:57 +02: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
Wladimir J. van der Laan
827d8c2e0c
Revert "Remove -Wformat* warnings from makefiles"
...
This reverts commit 14ac0adcc7
.
2012-10-01 19:45:42 +02:00
Philip Kaufmann
d210f4f5b8
fix -Wformat warnings all over the source
2012-10-01 19:45:42 +02:00
Wladimir J. van der Laan
bcc292b22d
Extend printf warnings to error()
2012-10-01 19:45:41 +02:00
Gavin Andresen
00a757375c
Merge branch '2012_09_base58tests' of github.com:laanwj/bitcoin
2012-10-01 11:22:38 -04:00
Wladimir J. van der Laan
02247490f6
Merge pull request #1886 from Diapolo/fix_Win_URI_assoc
...
Windows: fix URI association setting in registry
2012-09-30 22:07:16 -07:00
Wladimir J. van der Laan
d6b13283d1
data-driven base58 CBitcoinAddress/CBitcoinSecret tests
...
Arbitrary numbers of test vectors can be generated using the script
`gen_base58_test_vectors.py`.
2012-10-01 04:57:26 +02:00
Rune K. Svendsen
1bf66fcc0a
When encrypting the wallet, warn user that old backups will become useless.
...
Don't include HTML in translation strings. Do split the huge message over several lines.
Prettier lines
2012-09-30 15:57:53 +02:00
kjj2
31a8b70ee3
Add a backup warning to the encryptwallet RPC command
2012-09-30 08:50:59 -05:00
Wladimir J. van der Laan
2a739598b1
Merge pull request #1891 from Diapolo/printf_format_defs
...
harmonize printf format characters
2012-09-30 03:43:45 -07:00
Philip Kaufmann
9c8dc7caf1
harmonize printf format characters
...
- remove the "%" character from format characters for (s)size_t and
ptrdiff_t and harmonize them with the ones for int64 and uint64
2012-09-30 11:57:25 +02:00
Philip Kaufmann
c8bf315188
Windows: fix URI association setting in registry
...
- fix for #1877
- fix was reported to work via
https://bitcointalk.org/index.php?topic=110243.msg1230418#msg1230418
2012-09-29 12:25:22 +02:00
Wladimir J. van der Laan
018ec85ff7
Merge pull request #1875 from hsoft/master
...
Fix compilation with clang under OS X
2012-09-29 02:23:46 -07:00
Wladimir J. van der Laan
f72fd0e792
Merge pull request #1881 from xanatos/Tests
...
Removed a duplicated identical if
2012-09-29 01:00:55 -07:00
Wladimir J. van der Laan
a5ba586669
Merge pull request #1864 from Diapolo/Qt_4.8.2
...
switch to Qt 4.8.2 for Windows builds
2012-09-29 00:58:29 -07:00
Wladimir J. van der Laan
552af52b45
Merge pull request #1851 from fanquake/OpenSSL-1.0.1c
...
Update to use OpenSSL 1.0.1c
2012-09-29 00:58:15 -07:00