Pieter Wuille
d79775a04d
Merge pull request #2057 from Diapolo/FlushBlockFile
...
FlushBlockFile(): check for valid FILE pointer
12 years ago
Wladimir J. van der Laan
25fd38090a
Merge pull request #2066 from Diapolo/small_uiint_changes
...
UI interface changes
12 years ago
Pieter Wuille
cd1391ae4d
Merge pull request #2056 from sipa/fix_2052
...
Fixes for obscure mempool-checkpoint interaction
12 years ago
Pieter Wuille
a485c1b69e
Merge pull request #2063 from Diapolo/CDiskBlockPos
...
add 2 constructors in CDiskBlockPos to simplify class usage
12 years ago
Philip Kaufmann
15d8ff2029
rework ThreadSafeAskFee() / askFee() functions
...
- remove unused parameter from ThreadSafeAskFee(), which also results in
the removal of an orphan translation-string
12 years ago
Philip Kaufmann
7f5a1b529b
remove unneeded flag from MSG_INFORMATION and fix an indentation
12 years ago
Gavin Andresen
85887020dc
Merge pull request #2055 from redshark1802/master
...
more specific build instructions for Ubuntu
12 years ago
Pieter Wuille
469e606141
Merge pull request #2058 from sipa/atomicreorg
...
Make SetBestChain() atomic
12 years ago
Wladimir J. van der Laan
2e2fca4439
Merge pull request #2065 from Diapolo/remove_modal_flag
...
Bitcoin-Qt: remove obsolete modal flag from GUI APIs
12 years ago
redshark1802
2fdd1a8637
added build instructions for Ubuntu >= 12.04
12 years ago
Philip Kaufmann
3675588a30
Bitcoin-Qt: remove obsolete modal flag from GUI APIs
...
- as we (can) supply the CClientUIInterface::MODAL flag via the style
parameter, we don't need a separate bool for checking the modality
12 years ago
Wladimir J. van der Laan
7a8dd98863
Merge pull request #2046 from Diapolo/traymenu
...
split of createTrayIconMenu() from createTrayIcon() in BitcoinGUI
12 years ago
Philip Kaufmann
a8a4b9673e
add 2 constructors in CDiskBlockPos to simplify class usage
...
- add a default-constructor, which simply calls SetNull() and a
constructor to directly pass nFile and nPos
- change code to use that new constructors
12 years ago
Pieter Wuille
d33a9218ab
Make SetBestChain() atomic
...
In case a reorganisation fails, the internal state could become
inconsistent (memory only). Previously, a cache per block connect
or disconnect action was used, so blocks could not be applied in
a partial way. Extend this to a cache for the entire reorganisation,
making it atomic entirely. This also simplifies the code a bit.
12 years ago
Philip Kaufmann
b19388dd88
FlushBlockFile(): check for valid FILE pointer
...
- don't call FileCommit() and fclose() if no valid FILE pointer was
returned by OpenBlockFile()
12 years ago
Pieter Wuille
cd7fb7d1de
Merge pull request #2033 from sipa/kickconflicts
...
Bugfix: remove conflicting transactions from memory pool
12 years ago
Pieter Wuille
8259c57321
Only send reorged txn to mempool after checkpoint
12 years ago
Gavin Andresen
aaef016a07
Merge pull request #2037 from luke-jr/printpriority
...
Allow -printpriority without -debug
12 years ago
Pieter Wuille
da26a030b3
Merge pull request #2049 from sipa/testtmp
...
Make test_bitcoin run in a temp datadir
12 years ago
Pieter Wuille
038784b979
Enable script verification for reorganized mempool tx
12 years ago
Pieter Wuille
487db8a2b1
Make test_bitcoin run in a temp datadir
12 years ago
Pieter Wuille
597fa4cd63
Add GetTempPath() to util
12 years ago
Wladimir J. van der Laan
5c37be2db6
Merge pull request #2044 from Diapolo/backupwallet
...
do not silently ignore errors on "backupwallet" RPC cmd
12 years ago
Philip Kaufmann
f82102121f
split of createTrayIconMenu() from createTrayIcon() in BitcoinGUI
...
- this allows to setup the trayicon before we have and want a trayicon menu
- should be of great use, when we remove that splash screen
- fixes a small bug with the toggleHideAction icon, which is not only used with
trayicon but also with the Mac dock
12 years ago
Pieter Wuille
0c50d8b007
Merge pull request #2006 from robbak/make-leveldb-macro
...
Change 'make' to $(MAKE) in leveldb make command line
12 years ago
Wladimir J. van der Laan
97c8e6389e
Merge pull request #1988 from Diapolo/ThreadSafeMessageBox
...
update CClientUIInterface and remove orphan Wx stuff
12 years ago
Philip Kaufmann
ad525e9c8f
do not silently ignore errors on "backupwallet" RPC cmd
12 years ago
Luke Dashjr
2646080e3d
Allow -printpriority without -debug
12 years ago
Philip Kaufmann
5350ea4171
update CClientUIInterface and remove orphan Wx stuff
...
- fix ThreadSafeMessageBox always displays error icon
- allow to specify MSG_ERROR / MSG_WARNING or MSG_INFORMATION without a
custom caption / title
- allow to specify CClientUIInterface::ICON_ERROR / ICON_WARNING and
ICON_INFORMATION (which is default) as message box icon
- remove CClientUIInterface::OK from ThreadSafeMessageBox-calls, as
the OK button will be set as default, if none is specified
- prepend "Bitcoin - " to used captions
- rename BitcoinGUI::error() -> BitcoinGUI::message() and add function
documentation
- change all style parameters and enum flags to unsigned
- update code to use that new API
- update Client- and WalletModel to use new BitcoinGUI::message() and
rename the classes error() method into message()
- include the possibility to supply the wanted icon for messages from
Client- and WalletModel via "style" parameter
12 years ago
Pieter Wuille
231b399952
Bugfix: remove conflicting transactions from memory pool
...
When a transaction A is in the memory pool, while a transaction B
(which shares an input with A) gets accepted into a block, A was
kept forever in the memory pool.
This commit adds a CTxMemPool::removeConflicts method, which
removes transactions that conflict with a given transaction, and
all their children.
This results in less transactions in the memory pool, and faster
construction of new blocks.
12 years ago
Pieter Wuille
3ed1ccb089
Merge pull request #2004 from alexanderkjeldaas/simplify-cmutexlock
...
Simplify CMutexLock
12 years ago
Pieter Wuille
7818d230a2
Merge pull request #2013 from sipa/blockheader
...
Split off CBlockHeader from CBlock
12 years ago
Pieter Wuille
c07a1a6ee4
Merge pull request #1980 from sipa/noreorgsame
...
Do not reorganize if new branch has same amount of work
12 years ago
Wladimir J. van der Laan
b0e228a4b0
Merge pull request #2024 from Diapolo/fix_qt_crash
...
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
12 years ago
Gavin Andresen
edf6ba2690
Merge pull request #2031 from gavinandresen/scriptcomment
...
Add assert and comment for subtle pay-to-script-hash logic
12 years ago
Gavin Andresen
a91efb2d8d
Add assert and comment for subtle pay-to-script-hash logic
12 years ago
Philip Kaufmann
be8e1f8479
Bitcoin-Qt: fix crash on Windows caused by CDBEnv::EnvShutdown()
...
- can be triggerd by just adding -proxy=crashme with 0.7.1
- crash occured, when AppInit2() was left with return false; after the
first call to bitdb.open() (Step 6 in init)
- this is caused by GetDataDir() or .string() in CDBEnv::EnvShutdown()
called via the bitdb global destructor
- init fDbEnvInit and fMockDb to false in CDBEnv::CDBEnv()
12 years ago
Wladimir J. van der Laan
4725e96a3a
Merge pull request #2022 from Diapolo/fix_#2018
...
fix pull #2018
12 years ago
Philip Kaufmann
11406c89fe
ConnectBlock(): fix error() format to be unsigned
...
- I introduced the wrong format macro with my former patch (#2018 ), this
needs to be signed not unsigned (thanks Luke-Jr)
12 years ago
Wladimir J. van der Laan
98e7771ca1
Merge pull request #2019 from Diapolo/bitcoinstrings_upd
...
update bitcoinstrings.cpp and bitcoin_en.ts
12 years ago
Philip Kaufmann
baa510b210
update bitcoinstrings.cpp and bitcoin_en.ts
12 years ago
Gavin Andresen
e45d39f9ee
Merge pull request #2009 from sipa/fixmove
...
Prevent RPC 'move' from deadlocking
12 years ago
Pieter Wuille
1fefd2a5bc
Merge pull request #2018 from Diapolo/fix_warning
...
ensure we use our format macros to avoid compilation warnings
12 years ago
Philip Kaufmann
42152c3da9
ensure we use our format macros to avoid compilation warnings
...
- fixes 2 warnings I observed while compiling on Windows with MinGW
12 years ago
Wladimir J. van der Laan
0c42ee8130
Merge pull request #1767 from Diapolo/RPCCon_clear_history
...
clear history when using clear button in RPC console
12 years ago
Jeff Garzik
3ef292dc7d
Merge pull request #1670 from luke-jr/blksubstr
...
Use full block hash as unique identifier in debug.log
12 years ago
Jeff Garzik
848c0d5d95
Merge pull request #1945 from centromere/leveldb_fix
...
Fixed compile error on FreeBSD 9.
12 years ago
Jeff Garzik
34ea321ccd
Merge pull request #1987 from jgarzik/no-pw-match
...
RPC: Forbid RPC username == RPC password
12 years ago
Jeff Garzik
824e196054
Merge pull request #2005 from Diapolo/fixes_main
...
some small fixes for main.cpp/.h
12 years ago
Jeff Garzik
a0bf93b809
Merge pull request #2012 from luke-jr/invblk_errs
...
Print error for coinbase-pays-too-much case of ConnectBlock failing
12 years ago