Commit Graph

9973 Commits

Author SHA1 Message Date
Johnathan Corgan
9462e791b7 This is a cherry-pick of 89c844d back to 0.12.
=====

Re-instate TARGET_OS=linux in configure.ac. Removed by 351abf9e035.
2016-06-08 06:41:03 -07:00
Johnathan Corgan
932aedd99a Cherry-pick of f59dceb (#7925) to 0.12.
=====

qt: Fix out-of-tree GUI builds

Without this patch:

- When I compile the GUI from the bitcoin directory itself, it works as
  expected.

- When I build the GUI in an out-of-tree build, I cannot get it to
  select tabs. When I click, say the "Receive" tab nothing happens,
  the button selects but it doesn't switch the page. The rest - even
  the debug window - seems to work.

See full discussion here:
https://github.com/bitcoin/bitcoin/pull/7911#issuecomment-212413442

This turned out to be caused by a mismatch in the arguments to moc,
preventing it from finding `bitcoin-config.h`. Fix this by passing
`$(DEFAULT_INCLUDES)` to it, which gets set to the appropriate
path by autoconf itself.
2016-06-08 06:29:27 -07:00
Johnathan Corgan
03c709b422 Backport leveldb build integration to 0.12
This is a cherry-pick of a4625acb with minor conflict
resolution.

Conflicts:
	src/Makefile.am

=====

leveldb: integrate leveldb into our buildsystem

leveldb's buildsystem causes us a few problems:
- breaks out-of-tree builds
- forces flags used for some tools
- limits cross builds

Rather than continuing to add wrappers around it, simply integrate it into our
build.
2016-06-05 12:48:57 -07:00
Wladimir J. van der Laan
e7ec24e336
Merge #8001: [0.12.2] backport script_tests improvements
e3a9ce9 Refactor script tests (Pieter Wuille)
87129b2 test: script_error checking in script_invalid tests (Wladimir J. van der Laan)
2016-05-31 15:52:55 +02:00
Wladimir J. van der Laan
c3aedca2df
doc: Remove outdated qt4 install information from README.md
- doc: Remove outdated qt4 install information from README.md
- doc: 32 and 64 bit packages are seperate

Github-Pull: #8048
Rebased-From: e5764e69cbd0bf4eb98c96eeb31c94349bbe7b7c 6075bc4d67bcd5f95561dc6d53b4fdbaf2c63f4b
2016-05-18 12:17:58 +02:00
Pieter Wuille
e3a9ce9c94 Refactor script tests
Github-Pull: #7818
Rebased-From: c7c664191fd6ca4843cfe9d00abf8f2362b9550f 269281b7cc56e728fa64803fc7509ab3a0ce1805 d03e46625ac95954bb9ecbc2cf73ffd8de6b8a13 76da7613517d05aca31c2cee42b5ebf3d5c54974 009b503792737ab03aeb6e15060bc4f499500a96 dde46d3ae1de18700e089bc1861cf1e18649dc5d
2016-05-04 13:01:59 +02:00
Wladimir J. van der Laan
87129b24e1 test: script_error checking in script_invalid tests
Github-Pull: #7517
Rebased-From: b0ff8572aeb8211ad30f24ca42d20a46debb5e9d 2317ad7c56c6f5a55984459947f69cc3bfbe340a 0ecb3401fe157cb0779d3970c6080b463b1b0ed2
2016-05-04 13:01:55 +02:00
Wladimir J. van der Laan
18b3c3ced8
Merge #7950: [0.12] travis: switch to Trusty
564aaa2 travis: switch to Trusty (Cory Fields)
9ca957b tests: Make proxy_test work on travis servers without IPv6 (Wladimir J. van der Laan)
2016-04-27 14:11:44 +02:00
Cory Fields
564aaa2cd0 travis: switch to Trusty
Github-Pull: #7920
Rebased-From: 06fdffd222ba0a00add4abe9fab9ad2c3e220d8f, 9267a47d86d0673eae9e504ee566aa4e0410d923, cf77fcdb1fe525b63b004ef729173f04bdb48882, 174023c9b008fc02316bce972b0c1031de3feee3, a33b7c9cb545985771d074748c0e368ca2d06702
2016-04-27 12:29:56 +02:00
Wladimir J. van der Laan
9ca957bcd4 tests: Make proxy_test work on travis servers without IPv6
Github-Pull: #7489
Rebased-From: 7539f1aae3b41279dc5d49e09f448a78a071e114
2016-04-27 12:29:56 +02:00
MarcoFalke
89ae85484c
Merge #7811: [0.12.2] qa Backports
6862627 Add listunspent() test for spendable/unspendable UTXO (Joao Fonseca)
28ba22c [qa] Remove misleading "errorString syntax" (MarcoFalke)
f1f1b82 [qa] py2: Unfiddle strings into bytes explicitly (MarcoFalke)
c0d9e31 Tests: make prioritise_transaction.py more robust (Suhas Daftuar)
ff9b436 [qa] Bug fixes and refactor (MarcoFalke)
b1dd64b [qa] wallet: Wait for reindex to catch up (MarcoFalke)
f23cb7c [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock (MarcoFalke)
3316552 [qa] Test walletpassphrase timeout (MarcoFalke)
6aae129 [qa] wallet: Print maintenance (MarcoFalke)
ad8c743 [qa] Extend tests (MarcoFalke)
d89fbfe [qa] rpc-test: Normalize assert() (MarcoFalke)
2016-04-25 14:59:52 +02:00
Joao Fonseca
6862627ce6 Add listunspent() test for spendable/unspendable UTXO
Github-Pull: #7822
Rebased-From: fa942c755ab513829dcab27487ba1e7ab5a806ee 5d217decc1145823a3c126658c82c60cf7dbfec8
2016-04-19 16:37:14 +02:00
MarcoFalke
28ba22c202 [qa] Remove misleading "errorString syntax"
Github-Pull: #7801
Rebased-From: ffff866da83209dcaa463d8b9539d3f539f83a97
2016-04-19 16:36:41 +02:00
MarcoFalke
f1f1b82033 [qa] py2: Unfiddle strings into bytes explicitly
Github-Pull: #7853
Rebased-From: faa41ee204124da19dcf1e5b8a3aef1e216bf5e6, fa7abe0a00464e6aa88d55c63dba40878bbe5b79

 Conflicts:
	qa/rpc-tests/invalidtxrequest.py
	qa/rpc-tests/p2p-feefilter.py
	qa/rpc-tests/proxy_test.py
	qa/rpc-tests/test_framework/mininode.py
	qa/rpc-tests/test_framework/netutil.py
	src/test/bctest.py
2016-04-15 09:55:12 +02:00
Wladimir J. van der Laan
9779e1e1f3
Merge #7852: [0.12] Add missing reference to release notes
de7c34c Add missing link to BIP113 (BtcDrak)
2016-04-11 13:01:43 +02:00
BtcDrak
de7c34cab0
Add missing link to BIP113 2016-04-10 11:32:16 +01:00
Suhas Daftuar
c0d9e31611 Tests: make prioritise_transaction.py more robust
Github-Pull: #7697
Rebased-From: ec143391ef791c15c0d4520befb8863b61bfc2ea
2016-04-10 11:46:16 +02:00
Wladimir J. van der Laan
465d30915c
doc: update release notes for #7835 2016-04-08 14:24:57 +02:00
Suhas Daftuar
46898e7e94
Version 2 transactions remain non-standard until CSV activates
Before activation, such transactions might not be mined, so don't
allow into the mempool.

- Tests: move get_bip9_status to util.py

- Test relay of version 2 transactions

Github-Pull: #7835
Rebased-From: e4ba9f6b0402cf7a2ad0d74f617c434a26c6e124 5cb1d8a2071d05beb9907a423178895fd8a5c359 da5fdbb3a2778523cce70d635c1aa2b31a693bc6
2016-04-08 14:22:04 +02:00
Wladimir J. van der Laan
cada7c2418
Fill in rest of release notes 2016-04-07 14:00:30 +02:00
Wladimir J. van der Laan
4c3a00d35c
Reduce block timeout to 10 minutes
Now that #7804 fixed the timeout handling, reduce the block timeout from
20 minutes to 10 minutes. 20 minutes is overkill.

Conflicts:
	src/main.h

Github-Pull: #7832
Rebased-From: 62b9a557fca2aa55803c336ffcceccc50ccf0c3e
2016-04-07 13:53:48 +02:00
Pieter Wuille
90f1d246d3
Track block download times per individual block
Currently, we're keeping a timeout for each requested block, starting
from when it is requested, with a correction factor for the number of
blocks in the queue.

That's unnecessarily complicated and inaccurate.

As peers process block requests in order, we can make the timeout for each
block start counting only when all previous ones have been received, and
have a correction based on the number of peers, rather than the total number
of blocks.

Conflicts:
	src/main.cpp
	src/main.h

Self check after the last peer is removed

Github-Pull: #7804
Rebased-From: 2d1d6581eca4508838cd339cc19c72efc42d6ea0 0e24bbf679c95784ed5514a6a1f2fbf99dd97725
2016-04-07 13:16:16 +02:00
Wladimir J. van der Laan
4226aacdba
init: allow shutdown during 'Activating best chain...'
Two-line patch to make it possible to shut down bitcoind cleanly during
the initial ActivateBestChain.

Fixes #6459 (among other complaints).

To reproduce:

- shutdown bitcoind
- copy chainstate
- start bitcoind
- let the chain sync a bit
- shutdown bitcoind
- copy back old chainstate
- start bitcoind
- bitcoind will catch up with all blocks during Init()

(the `boost::this_thread::interruption_point` / `ShutdownRequested()`
dance is ugly, this should be refactored all over bitcoind at some point
when moving from boost::threads to c++11 threads, but it works...)

Github-Pull: #7821
Rebased-From: 07398e8e9d2ef807e63abd0978a6e98549bdf271
2016-04-07 13:00:17 +02:00
Wladimir J. van der Laan
c2106543fe
pre-rc1 translations update
New languages:

- `af` Afrikaans
- `es_AR` Spanish (Argentina)
- `es_CO` Spanish (Colombia)
- `ro` Romanian
- `ta` Tamil
- `uz@Latn` Uzbek in Latin script
2016-04-05 18:01:12 +02:00
Wladimir J. van der Laan
a784675a32
build: Remove unnecessary executables from gitian release
This removes the following executables from the binary gitian release:

- test_bitcoin-qt[.exe]
- bench_bitcoin[.exe]

@jonasschnelli and me discussed this on IRC a few days ago - unlike the
normal `bitcoin_tests` which is useful to see if it is safe to run
bitcoin on a certain OS/environment combination, there is no good reason
to include these. Better to leave them out to reduce the download
size.

Sizes from the 0.12 release:
```
2.4M bitcoin-0.12.0/bin/bench_bitcoin.exe
 22M bitcoin-0.12.0/bin/test_bitcoin-qt.exe
```

Github-Pull: #7776
Rebased-From: f063863d1fc964aec80d8a0acfde623543573823
2016-04-05 15:45:38 +02:00
MarcoFalke
ff9b436163 [qa] Bug fixes and refactor
Github-Pull: #7778
Rebased-From: fa524d9ddbad0a03f9eb974100fb3b6001045645 fa2cea163b49a97e2a18aa125e41170d60ce59cc faaa3c9b6546d9a64cece4ff0223f0b167feb6ff 444480649f08e6037f8ac178224b30a82e9ad72e
2016-04-05 11:55:07 +02:00
MarcoFalke
b1dd64bffe [qa] wallet: Wait for reindex to catch up
Github-Pull: #7757
Rebased-From: fa3fafc96076afb15fa77e01d5f6aff88a333a7e
2016-04-05 11:53:51 +02:00
MarcoFalke
f23cb7c944 [qa] Add tests verifychain, lockunspent, getbalance, listsinceblock
Github-Pull: #7702
Rebased-From: fa4a52254178655f50e73b50153730a60ffafd32
2016-04-05 11:53:50 +02:00
MarcoFalke
331655253d [qa] Test walletpassphrase timeout
Github-Pull: #7320
Rebased-From: fa1cb1ae15e74e6149ff7fd8aae6cba216914e4c
2016-04-05 11:53:50 +02:00
MarcoFalke
6aae129a60 [qa] wallet: Print maintenance
Github-Pull: #7372
Rebased-From: facd288c31c387bb3582c32f767a730ece6e408a
2016-04-05 11:53:50 +02:00
MarcoFalke
ad8c743421 [qa] Extend tests
Github-Pull: #7684
Rebased-From: fa3a81af18347a1d3fed41aa89ee643cbf0e7abc fad7dc8a6c0ca9c067a249cf8896dd2e64703e48 fad8cfb893ac0ba83c6fc2367ade55bfe4fa75f6
2016-04-05 11:53:50 +02:00
MarcoFalke
d89fbfe899 [qa] rpc-test: Normalize assert()
Github-Pull: #7720
Rebased-From: fab3890156c849e6b04309152d7a9bfcfcb98396
2016-04-05 11:53:50 +02:00
Wladimir J. van der Laan
e3341aa94e
Merge #7800: [0.12] Update release notes
e10c044 [0.12] Update release notes (BtcDrak)
2016-04-04 14:40:59 +02:00
Wladimir J. van der Laan
834aaef7bd
Merge #7543: [0.12] Backport BIP9, BIP68 and BIP112 with softfork
640666b [qa] rpc-tests: Properly use integers, floats (BtcDrak)
c270b62 Fix comments in tests (BtcDrak)
caf1381 Add bip68-sequence.py to extended rpc tests (BtcDrak)
26e9a05 Test of BIP9 fork activation of mtp, csv, sequence_lock (NicolasDorier)
3a99feb Add RPC test for BIP 68/112/113 soft fork. (Alex Morcos)
159ee3d Policy: allow transaction version 2 relay policy. (BtcDrak)
9713ed3 Soft fork logic for BIP68 (BtcDrak)
648be9b Soft fork logic for BIP113 (BtcDrak)
ee40924 Add CHECKSEQUENCEVERIFY softfork through BIP9 (Pieter Wuille)
6ff0b9f RPC test for BIP9 warning logic (Suhas Daftuar)
0710b30 Test versionbits deployments (Suhas Daftuar)
8ebc6f2 Add testing of ComputeBlockVersion (Suhas Daftuar)
0bdaacd Softfork status report in RPC (Pieter Wuille)
5f90d4e Versionbits tests (Pieter Wuille)
6f83cf2 BIP9 Implementation (Pieter Wuille)
ade85e1 Add LockPoints (Alex Morcos)
c8d309e Code style fix. (BtcDrak)
6170506 Separate CheckLockTime() and CheckSequence() logic (BtcDrak)
c0c5e09 BIP112: Implement CHECKSEQUENCEVERIFY (Mark Friedenbach)
197c376 fix sdaftuar's nits again (Alex Morcos)
0a79c04 Bug fix to RPC test (Alex Morcos)
0d09af7 Add RPC test exercising BIP68 (mempool only) (Suhas Daftuar)
15ba08c Implement SequenceLocks functions (Alex Morcos)
2016-04-04 13:08:29 +02:00
BtcDrak
640666b22f [qa] rpc-tests: Properly use integers, floats
partial backport from #7778 using fa2cea1
2016-04-03 18:06:06 +01:00
BtcDrak
e10c044c78 [0.12] Update release notes 2016-04-03 17:53:53 +01:00
Wladimir J. van der Laan
c5f94f6584
Merge #7780: [0.12] Disable bad-chain alert
8692626 Disable bad chain alerts (BtcDrak)
2016-04-01 14:16:40 +02:00
BtcDrak
869262605f Disable bad chain alerts
Continuous false positives lead to them being ignored entirely
so it's better to disable now until this can be fixed more
thoroughly.
2016-03-31 20:50:54 +01:00
accraze
4d035bcc9a
[doc] added depends cross compile info
Conflicts:
	doc/build-unix.md

Github-Pull: #7747
Rebased-From: 3e55b3a00450279522900ca96e5cf79162169019
2016-03-31 13:49:36 +02:00
BtcDrak
c270b62cc2 Fix comments in tests 2016-03-31 10:28:57 +01:00
Wladimir J. van der Laan
ba80ceef59
bump version to 0.12.1 2016-03-30 20:12:21 +02:00
BtcDrak
caf138122d Add bip68-sequence.py to extended rpc tests 2016-03-29 10:34:07 +01:00
Wladimir J. van der Laan
a0cea89456
Merge #7741: [0.12] Mark p2p alert system as deprecated
c0fe2c9 Mark p2p alert system as deprecated. (BtcDrak)
2016-03-29 10:52:28 +02:00
NicolasDorier
26e9a05cc3 Test of BIP9 fork activation of mtp, csv, sequence_lock 2016-03-26 04:05:42 +00:00
BtcDrak
c0fe2c9e03 Mark p2p alert system as deprecated.
Set default to off
This feature is removed entirely as of 0.13.0
2016-03-24 20:06:06 +00:00
Jonas Schnelli
597494f5a9
Remove openssl info from init/log and from Qt debug window
Conflicts:
	src/init.cpp

Github-Merge: #7605
Rebased-From: 5ecfa36fd01fc27475abbfcd53b4efb9da4a7398
2016-03-24 12:09:23 +01:00
Jonas Schnelli
7ffc2bd943
[Wallet][RPC] add abandoned status to listtransactions
Github-Pull: #7739
Rebased-From: 263de3d1c80c8a0aa54acd4d6708a4078d479b70
2016-03-23 16:30:49 +01:00
Alex Morcos
19866c1ffc
Fix calculation of balances and available coins.
No longer consider coins which aren't in our mempool.

Add test for regression in abandonconflict.py

Github-Pull: #7715
Rebased-From: 68d4282774d6a60c609301cddad0b652f16df4d9
2016-03-23 15:11:22 +01:00
Alex Morcos
3a99feba85 Add RPC test for BIP 68/112/113 soft fork.
This RPC test will test both the activation mechanism of the first versionbits soft fork as well as testing many code branches of the consensus logic for BIP's 68, 112, and 113.
2016-03-18 09:28:41 +00:00
BtcDrak
159ee3dd90 Policy: allow transaction version 2 relay policy.
This commit introduces a way to gracefully bump the default
transaction version in a two step process.
2016-03-18 09:28:41 +00:00