Commit Graph

4954 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
cf920b657d
Merge pull request #3405
55c6890 Squashed 'src/leveldb/' changes from 936b461..e991315 (Pieter Wuille)
2013-12-17 09:50:39 +01:00
Wladimir J. van der Laan
a549842499
Merge pull request #3431
131c3db Fix typos in spendfrom README (Lake Denman)
2013-12-17 07:30:48 +01:00
Wladimir J. van der Laan
8f5fd94497
Merge pull request #3434
46469d0 some more small re-branding changes (Bitcoin Core) (Philip Kaufmann)
2013-12-17 07:29:53 +01:00
Philip Kaufmann
46469d0f86 some more small re-branding changes (Bitcoin Core) 2013-12-16 23:36:22 +01:00
Lake Denman
131c3db8fb Fix typos in spendfrom README 2013-12-16 12:49:34 -08:00
Pieter Wuille
3743b80528 Merge pull request #3430 from ldenman/patch-1
Fix typo in unit-tests.md
2013-12-16 12:47:24 -08:00
Lake Denman
ba4ceb15d6 Fix typo in unit-tests.md 2013-12-16 12:38:11 -08:00
Wladimir J. van der Laan
93a7861d71
Merge pull request #3425
88ba264 qt: Update English language file for translators (Wladimir J. van der Laan)
2013-12-16 12:26:20 +01:00
Wladimir J. van der Laan
88ba2643f0 qt: Update English language file for translators 2013-12-16 12:25:25 +01:00
Wladimir J. van der Laan
2ed38d11a8
Merge pull request #3408
22f0135 Rebrand to `Bitcoin Core` (Wladimir J. van der Laan)
2013-12-16 12:23:31 +01:00
Wladimir J. van der Laan
3d7c66d75d
Merge pull request #3423
0205abd Improve unit test code not to compare with explanatory messages for each platform. Instead, use have an exception object to check if the string returned by what() on the raised exception matches the string returned by what() on the expected exception instance. This way, we do not need to list all different possible explanatory strings for different platforms in the test code, and make it simple. (The idea is by Cory Fields.) (Kangmo)
2013-12-16 07:59:07 +01:00
Kangmo
0205abd83d Improve unit test code not to compare with explanatory messages for each platform.
Instead, use have an exception object to check if the string returned by what() on the raised exception matches the string returned by what() on the expected exception instance.
This way, we do not need to list all different possible explanatory strings for different platforms in the test code, and make it simple. (The idea is by Cory Fields.)
2013-12-16 09:26:04 +09:00
Wladimir J. van der Laan
a5a65bbc90
Merge pull request #3420
bccd532 Fix unit test error on OSX 10.9 using Apple LLVM v5.0. (Kangmo)
2013-12-15 17:35:28 +01:00
Wladimir J. van der Laan
d05ce63c98
Merge pull request #3421
93a5d0b qt: use GUIUtil::dateTimeStr in coincontrol (Wladimir J. van der Laan)
2013-12-15 15:40:59 +01:00
Wladimir J. van der Laan
93a5d0bb98 qt: use GUIUtil::dateTimeStr in coincontrol 2013-12-15 15:39:09 +01:00
Kangmo
bccd5324ab Fix unit test error on OSX 10.9 using Apple LLVM v5.0.
Before the fix, there were 6 errors such as :
serialize_tests.cpp:77: error in "noncanonical": incorrect exception std::ios_base::failure is caught

It turns out that ex.what() returns following string instead of "non-canonical ReadCompactSize()"
"non-canonical ReadCompactSize(): unspecified iostream_category error"

After the fix, unit test passed.

The test ran using Apple LLVM v5.0 on OSX 10.9 and the unit test error happened because of different error messages by different compilers.

g++ --version on my development environment.

```
Configured with: --prefix=/Applications/Xcode.app/Contents/Developer/usr --with-gxx-include-dir=/usr/include/c++/4.2.1
Apple LLVM version 5.0 (clang-500.2.79) (based on LLVM 3.3svn)
Target: x86_64-apple-darwin13.0.0
Thread model: posix
```
2013-12-15 23:25:41 +09:00
Wladimir J. van der Laan
8a7606f35b
Merge pull request #3377
0b238b2 Use thread-local storage for LogPrint(category...) (Gavin Andresen)
962b1cf Fix infinite loop with LogPrint on Windows (Gavin Andresen)
2013-12-14 13:28:22 +01:00
Wladimir J. van der Laan
6bfaf2ac37
Merge pull request #3411
08b93f9 fixed documetation on hardening flags (HaltingState)
2013-12-13 13:45:19 +01:00
HaltingState
08b93f9a65 fixed documetation on hardening flags 2013-12-13 04:09:02 -08:00
Wladimir J. van der Laan
5e2fb330fd
Merge pull request #3409
a9a37c8 update help for -blockmaxsize and blockprioritysize (Philip Kaufmann)
2013-12-13 10:13:32 +01:00
Philip Kaufmann
a9a37c8bb5 update help for -blockmaxsize and blockprioritysize
- was left out in #3326
2013-12-13 10:01:21 +01:00
Wladimir J. van der Laan
22f0135df0 Rebrand to Bitcoin Core
Only messages for now, executable names and other file names
can be changed later if necessary and safe.

Do not do an all-sweeping change. Some occurences of Bitcoin-Qt need to
be kept:

- Applicationname: this is used to determine the registry entry names,
  we don't want to lose settings over a silly name change.
- Where it refers to the executable name instead of the product name.
2013-12-13 07:51:16 +01:00
Wladimir J. van der Laan
666225f687
Merge pull request #3387
3e01c00 Add tests for correct and incorrect order of signatures for a multisig (P2SH) (Tamas Blummer)
2013-12-13 06:03:40 +01:00
Wladimir J. van der Laan
150771c4f3
Merge pull request #3326
ad898b4 Increase default -blockmaxsize/prioritysize to 750K/50K (Gavin Andresen)
2013-12-13 05:39:35 +01:00
Wladimir J. van der Laan
d670cdd698
Merge pull request #3407
952fe2e docs: remove workaround instructions now that the problem is fixed (Cory Fields)
efdfee4 build: fix detection of boost libs on multi-arch distros (Cory Fields)
2013-12-13 05:16:19 +01:00
Cory Fields
952fe2ef32 docs: remove workaround instructions now that the problem is fixed 2013-12-12 19:09:12 -05:00
Cory Fields
efdfee423f build: fix detection of boost libs on multi-arch distros
Fixes #3219.
2013-12-12 19:09:00 -05:00
Pieter Wuille
ed873a301e Merge src/leveldb changes for LevelDB 1.15 2013-12-12 22:08:18 +01:00
Pieter Wuille
55c6890294 Squashed 'src/leveldb/' changes from 936b461..e991315
e991315 Merge upstream LevelDB 1.15.
0cfb990 Release LevelDB 1.15
02ac9f1 Merge upstream LevelDB 1.14.
0b9a89f Release LevelDB 1.14

git-subtree-dir: src/leveldb
git-subtree-split: e991315d7fe4ca84a98902578106cbffa3dcccfd
2013-12-12 22:08:18 +01:00
Gavin Andresen
fb34be6d59 Merge pull request #3393 from theuni/build-10.6
build: fix syntax error on older m4/autoconf.
2013-12-11 16:01:54 -08:00
Gavin Andresen
c4880e0172 Merge pull request #3395 from ldenman/patch-2
Use 'make check' instead of 'make test'
2013-12-11 15:33:03 -08:00
Lake Denman
3f2c6f8654 Use 'make check' instead of 'make test' 2013-12-11 14:11:21 -08:00
Cory Fields
b878b763cb build: fix syntax error on older m4/autoconf.
Fixes #3358. This affects preinstalled autotools on osx 10.6.
2013-12-11 16:27:56 -05:00
Wladimir J. van der Laan
5e47c2b70a
Merge pull request #3382
24646ee [Qt] fix possibilty to delete last sendcoins entry (Philip Kaufmann)
2013-12-11 15:10:21 +01:00
Philip Kaufmann
24646ee76f [Qt] fix possibilty to delete last sendcoins entry
- hide the entry about to be deleted, and if it is the last entry add a
  new one, so that we always have one entry in our list
2013-12-11 14:40:31 +01:00
Wladimir J. van der Laan
69127034c3
Merge pull request #3379
4f99b16 Release process: add section about announcing new release (Wladimir J. van der Laan)
2013-12-11 12:41:51 +01:00
Gavin Andresen
ef20293c51 Merge pull request #3389 from regergregregerrge/patch-1
Update build-osx.md
2013-12-11 00:13:28 -08:00
regergregregerrge
9392924d0d Update build-osx.md 2013-12-11 04:58:06 +01:00
Tamas Blummer
3e01c00f42 Add tests for correct and incorrect order of signatures for a multisig
(P2SH)
2013-12-11 00:03:50 +01:00
Wladimir J. van der Laan
6939a0d50e
Merge pull request #3350
fdbdb7f cleanup includes in rpcnet.cpp (Philip Kaufmann)
b6aafca some string and indentation updates in init/rpcclient (Philip Kaufmann)
2013-12-10 12:37:43 +01:00
Wladimir J. van der Laan
4f99b1601b Release process: add section about announcing new release 2013-12-10 09:57:30 +01:00
Wladimir J. van der Laan
fb96e28b29
Merge pull request #3378
b9c3416 Add protobuf-compiler dependency package for debian (Wladimir J. van der Laan)
2013-12-10 09:03:44 +01:00
Wladimir J. van der Laan
b9c3416723 Add protobuf-compiler dependency package for debian
Fixes #3361
2013-12-10 09:02:35 +01:00
Gavin Andresen
d47bbbd261 Merge pull request #3368 from laanwj/2013_11_disable_wallet_mining
Allow mining RPCs with --disable-wallet
2013-12-09 19:36:39 -08:00
Gavin Andresen
0b238b2786 Use thread-local storage for LogPrint(category...)
This prevents crashes at shutdown where a global destructor
calls LogPrint(category...) after mapMultiArgs has been
deleted.
2013-12-10 13:19:18 +10:00
Gavin Andresen
962b1cf441 Fix infinite loop with LogPrint on Windows
Running -printtodebugger -debug (or -debug=lock),
compiled with -DDEBUG_LOCKORDER would infinite loop
on Windows because every critical section lock/unlock
triggers a LogPrint.

Solution is to use the raw boost mutex instead of a CCriticalSection.
2013-12-10 11:34:28 +10:00
Wladimir J. van der Laan
955787f83f
Merge pull request #3207
666893b qt: keep a list of requested payments (Wladimir J. van der Laan)
2013-12-09 16:42:37 +01:00
Wladimir J. van der Laan
20a3c80790
Merge pull request #3178
f914c7a rpcwallet: use EnsureWalletIsUnlocked() where possible (Philip Kaufmann)
2013-12-09 16:24:23 +01:00
Philip Kaufmann
f914c7a1a4 rpcwallet: use EnsureWalletIsUnlocked() where possible
- replaces a pwalletMain->IsLocked() check
- in keypoolrefill init kpSize to 0 as we have the logic to determine max
  kpSize in pwalletMain->TopUpKeyPool() anyway
2013-12-09 16:19:12 +01:00
Wladimir J. van der Laan
6694f4a7a2
Merge pull request #3297
84f8551 [Qt] misc small Mac related changes/cleanups (Philip Kaufmann)
2013-12-09 15:36:14 +01:00