Gavin Andresen
4323bfeafd
Merge pull request #2776 from jgarzik/keypoolsize
...
RPC: keypoolrefill now permits optional size parameter, to bump keypool
11 years ago
Gavin Andresen
5c28d820b6
Merge pull request #2877 from gavinandresen/qt_unittest_makefile
...
Compile into build_test when creating bitcoin-qt_test
11 years ago
Gavin Andresen
5738877bed
Merge pull request #2899 from super3/master
...
Removed duplicate /doc files.
11 years ago
super3
c6cb40f04b
Removed duplicate files.
...
Left behind after the change to Markdown.
11 years ago
Gavin Andresen
8fa9b5cc45
Merge pull request #2658 from TheBlueMatt/forkalert
...
Detect any sufficiently long fork and alert the user just like any other alert
11 years ago
Gavin Andresen
6fc537f490
Merge pull request #2892 from r000n/master
...
Add missing 0x prefix in chainparams.cpp
11 years ago
Roman Mindalev
2b6a8993fb
Add missing 0x prefix in chainparams.cpp
11 years ago
Gavin Andresen
ac1bd701ba
Merge pull request #2890 from cozz/cozz1
...
do not call BuildMerkleTree() unnecessarily twice
11 years ago
Cozz Lovan
c7fa1a3586
do not call BuildMerkleTree() unnecessarily twice
11 years ago
Gavin Andresen
6cc766fa55
Merge pull request #2856 from Diapolo/crypter_headers
...
remove windows.h from crypter.cpp includes
11 years ago
Gavin Andresen
9d23db58c1
Merge pull request #2883 from codler/patch-5
...
Replace with existing constants
11 years ago
Han Lin Yap
1511769239
Use existing RPC_INVALID_PARAMETER constant
11 years ago
Gavin Andresen
ddd0e2f616
Merge pull request #2871 from gavinandresen/simplify_maporphan
...
Simplify storage of orphan transactions, fix CVE-2013-4627
11 years ago
Gavin Andresen
1188a33d18
Merge pull request #2882 from codler/patch-4
...
Fix typo
11 years ago
Han Lin Yap
b3915841b0
fix typo in README.md
11 years ago
Gavin Andresen
7b22c8e8ca
Merge pull request #2881 from Diapolo/translations_rem_newline
...
remove a newline from a string in init.cpp
11 years ago
Philip Kaufmann
265e2657b4
remove a newline from a string in init.cpp
...
- to match all other translatable strings in init.cpp and to simplify
translations via Transifex
11 years ago
Wladimir J. van der Laan
e07d9f77e9
Merge pull request #2879 from Diapolo/translations
...
translations update for Transifex 2013-08-05
11 years ago
Philip Kaufmann
0f1c8f23eb
translations update for Transifex 2013-08-05
11 years ago
Gavin Andresen
ae759b3788
Merge pull request #2849 from petertodd/if-else-else
...
Add unittests for multiple ELSEs in a row
11 years ago
Gavin Andresen
15047f5af0
Merge pull request #2851 from TheBlueMatt/master
...
Prepare for mempool testing in pull-tester and fix multi-block transaction resurrection
11 years ago
Gavin Andresen
2af267c150
Merge pull request #2857 from Diapolo/compat_cleanup
...
cleanup compat.h Windows stuff
11 years ago
Gavin Andresen
e622f3f195
Merge pull request #2855 from Diapolo/guard_CreatePidFile
...
exclude CreatePidFile() function on WIN32 as it is unused
11 years ago
Gavin Andresen
a4ae02969e
Merge pull request #2827 from Diapolo/rpccon_winpos
...
Bitcoin-Qt: save and restore position of debug window
11 years ago
Gavin Andresen
d687aaa311
Merge pull request #2865 from Diapolo/fix_intro_translation
...
fix string in intro.cpp, which is untranslatable on Transifex
11 years ago
Gavin Andresen
923602f11d
Compile into build_test when creating bitcoin-qt_test
11 years ago
Gavin Andresen
159bc48193
Simplify storage of orphan transactions
...
Orphan transactions were stored as a CDataStream pointer;
this changes the mapOrphanTransactions data structures to
store orphans as a CTransaction.
This also fixes CVE-2013-4627 by always re-serializing
transactions before relaying them.
11 years ago
Gavin Andresen
8f6f92c72b
Revert "Truncate oversize 'tx' messages before relaying/storing."
...
This reverts commit c40a5aaaf4
.
11 years ago
Wladimir J. van der Laan
6d89611c3a
Merge pull request #2850 from Diapolo/fix_intro
...
fix possible infinite loop in intro.cpp thread
11 years ago
Jeff Garzik
3b2ed514d3
Merge pull request #2867 from jgarzik/miner-sep
...
Move internal miner to separate miner.cpp module
11 years ago
Jeff Garzik
d247a5d130
Move internal miner/block creation to separate miner.cpp module.
...
Public functions referenced elsewhere are added to miner.h.
11 years ago
Jeff Garzik
18946846d5
Minor miner fixes (hey hey it's fun to say)
...
* Fix UpdateCoins() definition in main.h
* Remove pwalletMain reference from BitcoinMiner(), as it is passed
a wallet argument.
11 years ago
Jeff Garzik
8351d55cd3
Merge pull request #2866 from gavinandresen/loopdefine
...
Remove #define loop from util.h
11 years ago
Gavin Andresen
050d2e953f
Remove #define loop from util.h
...
Replace the loop macro with while (true). The #define caused
problems for Qt.
11 years ago
Philip Kaufmann
bef9f573b5
fix string in intro.cpp, which is untranslatable on Transifex
...
- seems the code tags in the original string cause errors, when using the
Transifex site for translation
11 years ago
Philip Kaufmann
c431e9f1f0
Bitcoin-Qt: save and restore position of debug window
...
- move the code for saving and restoring window positions from BitcoinGUI
to GUIUtil, make it more generic and also use it for saving/restoring
debug window positions
11 years ago
Pieter Wuille
c4316fefa5
Make sure new wallet variables are initialized
11 years ago
Pieter Wuille
4bb77b4963
Merge pull request #2541 from luke-jr/bugfix_wallet_resend
...
Bugfix: Store last/next wallet resend times unique per CWallet object
11 years ago
Pieter Wuille
83a3597071
Merge pull request #2702 from vinniefalco/leveldb-subtree-at-1-10-0
...
Leveldb subtree at 1 12 0
11 years ago
Pieter Wuille
f38f452251
Merge pull request #2863 from maaku/patch-1
...
Fix typo in README.md
11 years ago
Mark Friedenbach
cb501a7d44
Fix typo in README.md
11 years ago
Philip Kaufmann
5bc6d8e580
fix possible infinite loop in intro.cpp thread
...
- it was possible to trigger an infinite loop in FreespaceChecker::check() by
simply removing the drive letter on Windows (which leads to an infinite
loop in the FreespaceChecker thread)
- this was caused by not checking if we make progress with
parentDir.parent_path()
11 years ago
Wladimir J. van der Laan
2b894bceac
Merge pull request #2847 from Diapolo/fix_QApplication_include
...
Bitcoin-Qt: fix QApplication includes to match our include defaults
11 years ago
Wladimir J. van der Laan
7d3a50ddbe
Merge pull request #2848 from Diapolo/translations
...
update bitcoin_en.ts to current master (2013-07-23)
11 years ago
Gavin Andresen
5e67e124cf
Merge pull request #1889 from tcatm/multi-wallet
...
let user select wallet file with -wallet=foo.dat
11 years ago
Philip Kaufmann
852605d8d1
remove windows.h from crypter.cpp includes
...
- remove an unneeded windows.h include (comes from allocators.h, which is
included in crypter.h)
11 years ago
Philip Kaufmann
dd833a4cd8
cleanup compat.h Windows stuff
...
- remove an unneded include for mswsock.h as we use winsock2.h anyway
- move typedef u_int SOCKET; into the #ifndef WIN32 part
- remove typedef int socklen_t; as this is defined in ws2tcpip.h
11 years ago
Philip Kaufmann
a034c7ebb6
exclude CreatePidFile() function on WIN32 as it is unused
11 years ago
Matt Corallo
9bf2a4aba2
Fix multi-block reorg transaction resurrection
11 years ago
Matt Corallo
d9ace8abe8
Don't use checkpoints and accept nonstd txn on -regtest
11 years ago