highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-21 07:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,784 Commits 8 Branches 346 Tags
49524859ca257fa785fc97122e5bdeb8bc73320e
Commit Graph

3784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wladimir J. van der Laan
49524859ca Fix a use-after-free problem in initialization (#1920) 
Don't store the result of c_str().

Luckily, this only affects logging, though it could crash or leak
sensitive data to the log in rare cases.
 2012-10-20 23:29:07 +00:00
Luke Dashjr
f9459ef914 Merge branch '0.6.x' into 0.7.x 
Conflicts:
	src/bitcoinrpc.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-20 23:28:14 +00:00
Luke Dashjr
8a17087795 Tree-Merge branch '0.6.x' into 0.7.x 
Conflicts:
	bitcoin-qt.pro
	contrib/debian/patches/1001_use_system_json-spirit.patch
	doc/README
	doc/README_windows.txt
	doc/build-osx.txt
	doc/build-unix.txt
	doc/readme-qt.rst
	share/setup.nsi
	src/addrman.cpp
	src/bitcoinrpc.cpp
	src/checkpoints.cpp
	src/crypter.cpp
	src/db.cpp
	src/db.h
	src/init.cpp
	src/init.h
	src/irc.cpp
	src/key.cpp
	src/key.h
	src/main.cpp
	src/main.h
	src/makefile.linux-mingw
	src/makefile.mingw
	src/makefile.unix
	src/net.cpp
	src/net.h
	src/qt/addressbookpage.cpp
	src/qt/bitcoin.cpp
	src/qt/bitcoinaddressvalidator.cpp
	src/qt/bitcoingui.cpp
	src/qt/bitcoinstrings.cpp
	src/qt/forms/overviewpage.ui
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
	src/qt/optionsdialog.cpp
	src/qt/optionsmodel.h
	src/qt/overviewpage.cpp
	src/qt/overviewpage.h
	src/qt/sendcoinsdialog.cpp
	src/qt/transactiondesc.cpp
	src/qt/transactiontablemodel.h
	src/qt/walletmodel.cpp
	src/script.cpp
	src/test/DoS_tests.cpp
	src/util.cpp
	src/util.h
	src/version.h
	src/walletdb.cpp
 2012-10-20 23:26:08 +00:00
Luke Dashjr
37be168579 Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:23:33 +00:00
Luke Dashjr
747b688b54 Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_zh_CN.ts
 2012-10-15 18:18:01 +00:00
Luke Dashjr
f9d1d13855 Update supported translations 2012-10-15 18:16:24 +00:00
Luke Dashjr
a9f8791388 Merge branch '0.6.0.x' into 0.6.x 2012-10-15 18:14:15 +00:00
Luke Dashjr
c87919696d Merge branch '0.5.x' into 0.6.0.x 2012-10-15 18:14:05 +00:00
Philip Kaufmann
8365992f90 fix wrong (signed/unsigned) printf format specifier in bitcoinrpc.cpp 
- also includes the required bitcoinstrings.cpp update
 2012-10-15 14:57:10 +00:00
Luke Dashjr
5dc6be8bba Merge branch '0.6.0.x' into 0.6.x 
Conflicts:
	src/qt/locale/bitcoin_ca_ES.ts
	src/qt/locale/bitcoin_cs.ts
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_et.ts
	src/qt/locale/bitcoin_eu_ES.ts
	src/qt/locale/bitcoin_fa.ts
	src/qt/locale/bitcoin_fa_IR.ts
	src/qt/locale/bitcoin_fi.ts
	src/qt/locale/bitcoin_fr_CA.ts
	src/qt/locale/bitcoin_fr_FR.ts
	src/qt/locale/bitcoin_he.ts
	src/qt/locale/bitcoin_hr.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_lt.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ro_RO.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_sk.ts
	src/qt/locale/bitcoin_sr.ts
	src/qt/locale/bitcoin_sv.ts
	src/qt/locale/bitcoin_tr.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-09 23:45:19 +00:00
Luke Dashjr
38297ba90a Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/locale/bitcoin_da.ts
	src/qt/locale/bitcoin_de.ts
	src/qt/locale/bitcoin_en.ts
	src/qt/locale/bitcoin_es.ts
	src/qt/locale/bitcoin_es_CL.ts
	src/qt/locale/bitcoin_hu.ts
	src/qt/locale/bitcoin_it.ts
	src/qt/locale/bitcoin_nb.ts
	src/qt/locale/bitcoin_nl.ts
	src/qt/locale/bitcoin_pt_BR.ts
	src/qt/locale/bitcoin_ru.ts
	src/qt/locale/bitcoin_uk.ts
	src/qt/locale/bitcoin_zh_CN.ts
	src/qt/locale/bitcoin_zh_TW.ts
 2012-10-09 23:40:25 +00:00
Luke Dashjr
6ec7ac15ff Update supported translations 2012-10-09 23:28:53 +00:00
Luke Dashjr
3241935774 Merge branch '0.6.0.x' into 0.6.x 2012-10-09 23:17:49 +00:00
Luke Dashjr
4cf9b4c6fa Merge branch '0.5.x' into 0.6.0.x 
Conflicts:
	src/qt/transactiondesc.cpp
 2012-10-09 23:17:43 +00:00
Luke Dashjr
cef36fad89 Merge branch '0.4.x' into 0.5.x 
Conflicts:
	src/bitcoinrpc.cpp
	src/init.cpp
 2012-10-09 23:16:24 +00:00
Gavin Andresen
b3f8f6ab94 Avoid crashes at shutdown due to printf() in global destructors. 2012-10-09 23:12:50 +00:00
Wladimir J. van der Laan
d37a2fd808 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-09 23:04:59 +00:00
Wladimir J. van der Laan
638cecee77 When datadir missing, show messagebox instead of printing error to stderr 2012-10-09 23:01:16 +00:00
Rune K. Svendsen
a7642282f6 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-10-09 22:57:34 +00:00
kjj2
bced903ae5 Add a backup warning to the encryptwallet RPC command 2012-10-09 22:57:11 +00:00
Philip Kaufmann
135bee074d 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-10-09 22:55:28 +00:00
xanatos
cc57473222 toHTML won't add empty wtx.mapValue elements 
As the code was before, toHTML added empty elements to mapValue to check for their existance. Now first it check for their existance and then for their non-emptiness.

Removed a duplicated identical if

There are two equal ifs, one inside another. If the first one is true, then the second one is true.
 2012-10-09 22:52:35 +00:00
Philip Kaufmann
6a9a280ec7 change last occurance of mac to macx in Qt project-file 2012-10-09 22:38:28 +00:00
Gavin Andresen
d1b7590911 Compile/link Bitcoin-Qt.app with -pthread 2012-10-09 22:30:01 +00:00
Philip Kaufmann
207ef3008c additional fix for #1843 
- a shortcut on "receive coins" was used twice
 2012-10-09 22:22:07 +00:00
fanquake
e25f0f0e53 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:18:21 +00:00
fanquake
599ec1e115 Update Bugreport Links 
Update Qt Links

Revert Qt source link

Update Qt links

PARTIAL of e1eb3d4
 2012-10-09 18:17:31 +00:00
Philip Kaufmann
9769d14f03 Change hotkey for "Send" button to "e" since "S" is already used for "Settings" menu 
Partial of upstream da9413d913
 2012-10-09 18:13:58 +00:00
Gavin Andresen
3d6adbe71a Update gitignore and Makefiles for build.h move from src/ to src/obj 2012-10-09 18:07:44 +00:00
Gavin Andresen
eb49457ff2 0.7.1 release notes v0.7.1 v0.7.1rc1 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
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
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
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