Commit Graph

4481 Commits

Author SHA1 Message Date
Gavin Andresen
acb3ebc455 Merge pull request #2947 from gmaxwell/theyre_maturing_faster_these_days
[wallet] Consider generated coins mature at COINBASE_MATURITY+1
2013-10-03 22:52:38 -07:00
Gavin Andresen
d922c85716 Merge pull request #2999 from TheBlueMatt/master
Update contrib/debian: proper desktop category and update changelog
2013-10-03 21:52:27 -07:00
Gavin Andresen
a68fd1ca14 Merge pull request #3040 from Diapolo/Qt_misc2
Bitcoin-Qt: add missing change from branch Qt_misc
2013-10-03 21:42:27 -07:00
Gavin Andresen
af880e8d3a Merge pull request #3050 from Diapolo/fix_IsRFC4193_comment
fix #3049 by changing comment for CNetAddr::IsRFC4193()
2013-10-03 21:12:48 -07:00
Gavin Andresen
fea7236ca3 Merge pull request #3051 from Diapolo/bitcoind-rc
rename bitcoin-res.rc to bitcoind-res.rc
2013-10-03 21:11:57 -07:00
Gavin Andresen
32b668655e Merge pull request #3028 from Michagogo/fix-dep-links
Fix and improve release-process.md
2013-10-03 18:05:34 -07:00
Micha
61823c47db HTTPS-ify the downloads for the deps 2013-10-04 00:02:46 +03:00
Micha
d18f5bf12c Switch the order of win32 deps and win32 qt in release-process.md
release-process.md has the deps being built after qt. However, the descriptors for qt call for the deps file.
2013-10-04 00:02:45 +03:00
Micha
7048443e8b Fix and improve release-process.md
This commit adds a step, which is to git checkout the version to be
built. This ensures that the gitian-descriptors for said version will be
the correct ones. In addition, it updates the links for several
dependencies, where the previously existing links were dead.
2013-10-04 00:02:44 +03:00
Jeff Garzik
5ad5e2d836 Merge pull request #3038 from Diapolo/Log_Shutdown
log start and end of Shutdown()
2013-10-03 06:16:06 -07:00
Philip Kaufmann
cbf87fc4a6 rename bitcoin-res.rc to bitcoind-res.rc
- helps recognizing that the resource file belongs to bitcoind.exe
2013-10-03 15:06:31 +02:00
Philip Kaufmann
c1761a5df3 fix #3049 by changing comment for CNetAddr::IsRFC4193() 2013-10-03 15:03:33 +02:00
Jeff Garzik
28f6b8dbad RPC validateaddress: test pwalletMain for NULL (no-wallet mode) 2013-10-02 05:51:13 -04:00
Philip Kaufmann
ced3c24816 log start and end of Shutdown()
- could be helpful when debugging shutdown related problems
2013-10-02 08:36:47 +02:00
Jeff Garzik
19e5ae7369 Merge branch 'pwalletmain' - checking pwalletMain for NULL,
a pre-req for no-wallet support.
2013-10-01 16:18:50 -04:00
Jeff Garzik
b0730874d9 Support absence of wallet (pwalletMain==NULL) in several locations,
notably RPC.
2013-10-01 16:14:37 -04:00
Wladimir J. van der Laan
b63ae2a534 Merge pull request #2991 from Diapolo/translation_fixes
Bitcoin-Qt: translation fixes in sendcoins
2013-10-01 08:18:48 -07:00
Jeff Garzik
19c415b1cf Merge pull request #2888 from litecoin-project/getnetworkhashps
Add getnetworkhashps to get the estimated network hashrate
2013-10-01 07:09:04 -07:00
Philip Kaufmann
23b48d13f1 Bitcoin-Qt: translation fixes in sendcoins
- remove some unneeded translatable strings from sendcoinsentry.ui file and
  rename some elements for better readability
- optimize string prorcessing in SendCoinsDialog::on_sendButton_clicked()
- make all UI labels for secure payments plain text and move the settings
  to sendcoinsentry.ui file
- remove unneeded button and default button definiton from warning message
  boxes
- remove fixed font-size when sending coins to an address with label and
  use monospace font for addresses
2013-10-01 15:48:25 +02:00
Wladimir J. van der Laan
95a766abc5 Merge pull request #3042 from wtogami/nowinedep
Hardcode string in miniupnpcstring.h and remove wine from deps-win32.yml
2013-10-01 06:04:00 -07:00
Philip Kaufmann
ab25271d3c Bitcoin-Qt: add missing change from branch Qt_misc
- remove an unneeded debug message in walletframe
2013-10-01 14:15:19 +02:00
Wladimir J. van der Laan
b85560a1b5 Merge pull request #3045 from Diapolo/master
misc small spelling/indentation fixes
2013-10-01 04:14:54 -07:00
Warren Togami
738b8598ae Hardcode string in miniupnpcstring.h and remove wine requirement from deps-win32.yml
Credit: sipa, cfields, Luke-Jr and michagogo contributed to this fix.

Removing wine as a win32 build dep is beneficial to fixing Gitian LXC,
which would enable many more people to join in the gitian.sigs process
by being able to build with a linux VM instead of a virt capable host.
2013-09-30 22:05:20 -10:00
Philip Kaufmann
f65dddc7b2 misc small spelling/indentation fixes 2013-10-01 09:47:16 +02:00
Wladimir J. van der Laan
bb3319f296 Merge pull request #3043 from wtogami/fixqtwin32
Fix gitian qt-win32.yml build
2013-09-30 23:08:54 -07:00
Warren Togami
b5ab7f34f8 Fix gitian qt-win32.yml build
The final revision of PR 3029 incorporated a review suggestion of replacing
i686-w64-mingw32 with $HOST. But we forgot that $HOST is not expanded when
within single quotes so it actually broke qt-win32.yml build.  This is the
minimal changes necessary to fix the qt-win32.yml build.
2013-09-30 18:01:05 -10:00
Pieter Wuille
6865127551 Merge pull request #3015 from theuni/win32-version-info
Win32 version info
2013-09-29 06:49:23 -07:00
Wladimir J. van der Laan
75d31c84db Merge pull request #3039 from Diapolo/Qt_misc
several small Qt-related fixes
2013-09-29 02:50:56 -07:00
Gavin Andresen
b2180d82a4 Merge pull request #3029 from wtogami/gitianwin32
Upgrade gitian win32 to Precise 12.04.
2013-09-29 01:44:07 -07:00
Philip Kaufmann
d5f0ef54f8 several small Qt-related fixes
- make BitcoinGUI::showPaymentACK() use a reference for msg and use our
  own GUIUtil::HtmlEscape() function
- ensure QTimer usage in clientmodel is the same as in walletmodel
- remove an unneeded debug message in walletframe
- flag some parameters as unused in DebugMessageHandler()
- small code formatting changes
2013-09-28 19:32:34 +02:00
Wladimir J. van der Laan
b41fa66ba7 Merge pull request #3034 from fanquake/corect-qt-download-link
Update Qt 4.8.3 download link in Gitian Descriptors README
2013-09-28 04:52:34 -07:00
Wladimir J. van der Laan
e21a435dd1 Merge pull request #3035 from fanquake/remove-homebrew-patches
Remove obselete HomeBrew patches
2013-09-28 02:16:50 -07:00
Wladimir J. van der Laan
7de4e47d5f Merge pull request #3031 from Diapolo/miner
internal miner: move 2 globals from main to miner
2013-09-28 01:21:57 -07:00
Wladimir J. van der Laan
18c5910e8f Merge pull request #3027 from cozz/cozz2
GUI: fix sendcoinsdialog/sendcoinsentry
2013-09-28 00:46:41 -07:00
fanquake
cd4d495ed4 Update Qt 4.8.3 download link 2013-09-27 09:38:44 +08:00
Warren Togami
f2bc1d35d6 Upgrade gitian win32 to boost-1.54.0
Workaround 1.54.0 build bug, upstream #9156
Workaround 1.51.0+ human bug, upstream #7262

This commit also demonstrates a method to verify the integrity of inputs.
2013-09-26 04:10:17 -10:00
Warren Togami
af6c2c71ed Upgrade gitian win32 to Precise 12.04.
mingw upgrade allows more hardening, compiler bug fixes and possibily win64 later.
Rename deps .zip files to be more consistent in revision format.
Boost #4258 build fix for mingw32
2013-09-25 23:52:56 -10:00
fanquake
619e76e6e6 Removes obselete HomeBrew patches 2013-09-26 16:00:18 +08:00
Cory Fields
c589f5f2bd build: add libcrypt32 dep for new mingw. Also ensure that libgcc/libstdc++ are static-linked regardless of the toolchain config 2013-09-25 17:15:57 -10:00
Philip Kaufmann
8d750f1d21 internal miner: move 2 globals from main to miner
- moves 2 global variables from main.cpp/h to miner.cpp/h
- also removes 2 unneded includes in miner.cpp, that come from miner.h
  already
2013-09-25 15:48:11 +02:00
Pieter Wuille
d14b86730b Merge pull request #3026 from sipa/checkunspend
Skip unspendable outputs in consistency check
2013-09-25 04:41:02 -07:00
Cozz Lovan
5dc9164edc GUI: fix sendcoinsdialog/sendcoinsentry 2013-09-24 16:10:38 +02:00
Pieter Wuille
99740bab9c Skip unspendable outputs in consistency check 2013-09-24 14:11:20 +02:00
Gavin Andresen
fb8724ee6c Merge pull request #2791 from sipa/proveprune
Prune provably-unspendable outputs
2013-09-23 14:23:14 -07:00
Pieter Wuille
a28fb70e45 Merge pull request #3016 from sipa/lows
Use 'low S' as malleability breaker rather than 'even S'
2013-09-23 06:05:29 -07:00
Gavin Andresen
8e782e924e Merge pull request #3023 from Michagogo/pgp
Add michagogo to gitian download scripts
2013-09-23 00:33:32 -07:00
Gavin Andresen
ff4e3e63e7 Merge pull request #2949 from gmaxwell/fewer_fee_footguns
[raw] reject insanely high fees by default in sendrawtransaction
2013-09-22 16:44:35 -07:00
Micha
7010e505f5 Adjust weight for michagogo in gitian download scripts
Following a discussion in #bitcoin-dev, around
19:00 UTC, 20132209
2013-09-22 23:11:54 +03:00
Micha
0766e6ced5 Add michagogo to gitian download scripts 2013-09-21 23:44:16 +03:00
Wladimir J. van der Laan
c2f4187263 Merge pull request #2995 from Diapolo/GUI_message
Bitcoin-Qt: BitcoinGUI::message() updates/fixes
2013-09-20 23:38:56 -07:00