Commit Graph

8624 Commits

Author SHA1 Message Date
Cory Fields
e979f09b6a build: Set osx permissions in the dmg to make Gatekeeper happy
Github-Pull: #7092
Rebased-From: 392d3c5846
2016-03-24 21:07:00 +00:00
Luke Dashjr
d626faa06e Merge commit '5c0b357' into backports-for-0.11.3 2016-03-24 21:06:45 +00:00
Wladimir J. van der Laan
0ba7020cf6 Merge #7682: [0.11.3] Fix "Unclear error when starting Bitcoin Core"
7e1f975 [trivial] init cleanup (MarcoFalke)
2016-03-15 09:19:23 +01:00
Wladimir J. van der Laan
d49f72420b Revert "[wallet] Add rpc tests to verify fee calculations"
This reverts commit 5f09cda0bf.

(make tests pass again)
2016-03-14 15:30:36 +01:00
Wladimir J. van der Laan
b6f59048d3 Revert "Default fPayAtLeastCustomFee to false"
This reverts commit 7d0a05f4c1.

This change in fee behavior was unexpected to users and shouldn't
be in a backport release. See detailed timeline in
https://github.com/bitcoin/bitcoin/issues/7633#issuecomment-195254622
for details.

People can upgrade to 0.12 if they want this new behavior.
2016-03-14 15:27:42 +01:00
MarcoFalke
7e1f9750b6 [trivial] init cleanup
Github-Pull: #6664
Rebased-From: 4c3cab14b7
2016-03-14 15:02:58 +01:00
MarcoFalke
a0cfe3a9e6 [depends] builders: No need to set -L and --location for curl
Github-Pull: #7606
Rebased-From: fa7a5c54fc
2016-03-01 15:17:03 +01:00
Luke Dashjr
77841d4358 Workaround Travis-side CI issues
Github-Pull: #7487
Rebased-From: 149641e8fc c01f08db12 5d1148cb79 1ecbb3b0f7
2016-03-01 15:16:53 +01:00
MarcoFalke
a0e13f0da6 Fix url in .travis.yml
Github-Pull: #7136
Rebased-From: 9999cb0626
2016-03-01 15:16:44 +01:00
Luke Dashjr
7815cb6fa1 Bugfix: gitian: Add curl to packages (now needed for depends)
Github-Pull: #7614
Rebased-From: 5c70a6d6d1
2016-03-01 15:16:31 +01:00
MarcoFalke
c40ec14210 [walletdb] Fix syntax error in key parser
Github-Pull: #7381
Rebased-From: fa6d4cc095
2016-01-20 13:09:36 +01:00
Wladimir J. van der Laan
00aefccb12 Merge pull request #7259
fa3cb49 [init] Fix typo (MarcoFalke)
fa24941 [dbwrapper] Detect obfuscation (MarcoFalke)
2016-01-09 16:34:18 +01:00
MarcoFalke
fa3cb4946f [init] Fix typo 2015-12-26 23:21:09 +01:00
MarcoFalke
fa24941c46 [dbwrapper] Detect obfuscation 2015-12-26 22:48:37 +01:00
MarcoFalke
5f09cda0bf [wallet] Add rpc tests to verify fee calculations
Conflicts:
	qa/rpc-tests/wallet.py

Rebased-From: fa506c0c9b
2015-11-30 12:21:29 +01:00
Ryan Havar
7d0a05f4c1 Default fPayAtLeastCustomFee to false
This allows for much finer control of the transaction fees per kilobyte
as it prevent small transactions using a fee that is more appropriate
for one that is of a kilobyte.

This also allows controlling the fee per kilobyte over rpc such that:

bitcoin-cli settxfee `bitcoin-cli estimatefee 2`

would make sense, while currently it grossly fails often by a factor of x3

Conflicts:
	src/wallet/wallet.cpp
Rebased-From: 4b89f01d72
2015-11-30 12:19:55 +01:00
Cory Fields
5c0b357bf6 build: Use fPIC rather than fPIE for qt objects.
But only if qt was built with reduced relocations.

Github-Pull: #6978
Rebased-From: 69d0513436
2015-11-18 00:21:02 +00:00
Cory Fields
90de0e1c2f build: Split hardening/fPIE options out
This allows for fPIE to be used selectively.

Github-Pull: #6978
Rebased-From: 17c4d9d164
2015-11-18 00:15:39 +00:00
Wladimir J. van der Laan
595c8d6301 Merge pull request #7021
9730051 add bip65 tests to rpc-tests.sh -extended (Alex Morcos)
2015-11-16 09:50:46 +01:00
Alex Morcos
9730051708 add bip65 tests to rpc-tests.sh -extended 2015-11-15 15:12:22 -05:00
Wladimir J. van der Laan
7e278929df Merge pull request #6975
ab6ff12 [doc] 0.11.2 release notes: use original pull numbers (David A. Harding)
v0.11.2
2015-11-10 14:46:18 +01:00
David A. Harding
ab6ff126e2 [doc] 0.11.2 release notes: use original pull numbers
[ci skip]
2015-11-09 13:20:54 -05:00
Wladimir J. van der Laan
3dcb390fe9 Merge pull request #6968
9149589 [docs] 0.11.2 release notes: add sipa graphs & leveldb note (David A. Harding)
929b2c7 [docs] Minor revisions to 0.11.2RC1 release notes (David A. Harding)
40941d9 [Docs] First-draft release notes for 0.11.2RC1 (David A. Harding)
2015-11-09 11:27:24 +01:00
David A. Harding
9149589632 [docs] 0.11.2 release notes: add sipa graphs & leveldb note
[ci skip]
2015-11-08 19:15:12 -05:00
David A. Harding
929b2c73df [docs] Minor revisions to 0.11.2RC1 release notes
- Revisions to text as proposed by Greg Maxwell
- Add Btcdrak to contributors for backporting #6884
- Fix spelling mistake

[ci skip]
2015-11-08 14:21:18 -05:00
David A. Harding
40941d999d [Docs] First-draft release notes for 0.11.2RC1 2015-11-08 13:47:39 -05:00
Wladimir J. van der Laan
984587ac5d bump version to 0.11.2 v0.11.2rc1 2015-11-08 00:56:01 +01:00
Pieter Wuille
4e895b08da Always flush block and undo when switching to new file
Previously, the undo weren't being flushed during a reindex because
fKnown was set to true in FindBlockPos. That is the correct behaviour
for block files as they aren't being touched, but undo files are
touched.

This changes the behaviour to always flush when switching to a new file
(even for block files, though that isn't really necessary).

Rebased-From: 22e780737d
Github-Pull: #6948
2015-11-06 14:30:46 +01:00
Wladimir J. van der Laan
6c31ac019f Merge pull request #6825
af6edac *: alias -h for --help (Daniel Cousens)
131d7f9 Change URLs to https in debian/control (Matt Corallo)
7ce2c91 Update debian/changelog and slight tweak to debian/control (Matt Corallo)
4fbfebe Correct spelling mistakes in doc folder (Mitchell Cash)
e42bf16 Clarification of unit test build instructions. (Eric Lombrozo)
54f9dee Update bluematt-key, the old one is long-since revoked (Matt Corallo)
bfc6154 [Trivial] Fixed typo when referring to a previous section in depends/README.md [skip ci] (Chris Kleeschulte)
9e45157 build: disable -Wself-assign (Wladimir J. van der Laan)
33d6825 Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case) (Luke Dashjr)
87a797a build: Remove dependency of bitcoin-cli on secp256k1 (Wladimir J. van der Laan)
a33cd5b [trivial] Fix rpc message "help generate" (MarcoFalke)
6fd0019 Drop "with minimal dependencies" from description (Zak Wilcox)
2394f4d Split bitcoin-tx into its own package (Zak Wilcox)
1e672ae Include bitcoin-tx binary on Debian/Ubuntu (Zak Wilcox)
b3eaa30 [Qt] Raise debug window when requested (MarcoFalke)
01878c9 Fix locking in GetTransaction. (Alex Morcos)
9b9acc2 Fix spelling of Qt (Diego Viola)
2015-11-06 14:08:06 +01:00
Wladimir J. van der Laan
df616ae43e Merge pull request #6884
f720c5f Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints (Mark Friedenbach)
a1d3c6f Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations (Mark Friedenbach)
2015-11-05 12:18:21 +01:00
Wladimir J. van der Laan
2c82485524 Merge pull request #6945
0af5b8e Squashed 'src/leveldb/' changes from 7d41e6f..20ca81f (Pieter Wuille)
2015-11-05 10:52:19 +01:00
Pieter Wuille
70de437eb4 Update LevelDB 2015-11-04 23:48:07 +01:00
Pieter Wuille
0af5b8ed38 Squashed 'src/leveldb/' changes from 7d41e6f..20ca81f
20ca81f Merge pull request #9
7aa105e leveldb: Win32WritableFile without memory mapping

git-subtree-dir: src/leveldb
git-subtree-split: 20ca81f08fb7fa108923a091668e447dcf5c6b9d
2015-11-04 23:48:07 +01:00
Mark Friedenbach
f720c5fc9f Enable policy enforcing GetMedianTimePast as the end point of lock-time constraints
Transactions are not allowed in the memory pool or selected for inclusion in a block until their lock times exceed chainActive.Tip()->GetMedianTimePast(). However blocks including transactions which are only mature under the old rules are still accepted; this is *not* the soft-fork required to actually rely on the new constraint in production.
2015-10-23 21:33:51 +01:00
Mark Friedenbach
a1d3c6fb9d Add rules--presently disabled--for using GetMedianTimePast as endpoint for lock-time calculations
The lock-time code currently uses CBlock::nTime as the cutoff point for time based locked transactions. This has the unfortunate outcome of creating a perverse incentive for miners to lie about the time of a block in order to collect more fees by including transactions that by wall clock determination have not yet matured. By using CBlockIndex::GetMedianTimePast from the prior block instead, the self-interested miner no longer gains from generating blocks with fraudulent timestamps. Users can compensate for this change by simply adding an hour (3600 seconds) to their time-based lock times.

If enforced, this would be a soft-fork change. This commit only adds the functionality on an unexecuted code path, without changing the behaviour of Bitcoin Core.
2015-10-23 21:33:31 +01:00
Alex Morcos
dfe55bdc32 Do not allow blockfile pruning during reindex.
Also clarify startup message.

Github-Pull: #6856
Rebased-From: d3b09f6bac
2015-10-23 14:42:05 +02:00
Wladimir J. van der Laan
fc7f0ee28c Merge pull request #6707
6af25b0 Add BIP65 to getblockchaininfo softforks list (Peter Todd)
ba1da90 Show softfork status in getblockchaininfo (Wladimir J. van der Laan)
70a427b CLTV: Add more tests to improve coverage (Esteban Ordano)
c5a27f4 Add RPC tests for the CHECKLOCKTIMEVERIFY (BIP65) soft-fork (Peter Todd)
5e82e1c Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic (Peter Todd)
6ea5ca4 Enable CHECKLOCKTIMEVERIFY as a standard script verify flag (Peter Todd)
4fa7a04 Replace NOP2 with CHECKLOCKTIMEVERIFY (BIP65) (Peter Todd)
6ec08db Move LOCKTIME_THRESHOLD to src/script/script.h (Peter Todd)
684636b Make CScriptNum() take nMaxNumSize as an argument (Peter Todd)
2015-10-23 13:35:06 +02:00
Gregory Maxwell
95a50390e1 Set TCP_NODELAY on P2P sockets.
Nagle appears to be a significant contributor to latency now that the static
 sleeps are gone.  Most of our messages are relatively large compared to
 IP + TCP so I do not expect this to create enormous overhead.

This may also reduce traffic burstyness somewhat.

Conflicts:
	src/net.cpp

Rebased-From: a4e28b3d1e
Github-Pull: #6867
2015-10-23 10:02:53 +02:00
Daniel Cousens
af6edac0bd *: alias -h for --help 2015-10-23 03:24:59 +00:00
Matt Corallo
131d7f997c Change URLs to https in debian/control 2015-10-23 03:24:27 +00:00
Matt Corallo
7ce2c91503 Update debian/changelog and slight tweak to debian/control 2015-10-23 03:24:21 +00:00
Mitchell Cash
4fbfebea5b Correct spelling mistakes in doc folder
- OSX —> OS X
- XCode —> Xcode
- github —> GitHub
- homebrew —> Homebrew
- gitian —> Gitian
- Other miscellaneous obvious spelling fixes and whitespace removal
2015-10-23 03:22:52 +00:00
Alex Morcos
072032448b Make fee aware of min relay in pruning.py RPC test
Rebased-From: b6d5e32e0e
Github-Pull: #6841
2015-10-20 13:35:24 +02:00
Wladimir J. van der Laan
21e58b8e35 build: make sure OpenSSL heeds noexecstack
This passes `-Wa,--noexecstack` to the assembler when building
platform-specific assembly files, to signal that a non-executable stack
can be used. This is the same approach as used by Debian
(see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=430583)

Rebased-From: bfcdc21a5d
Github-Pull: #6852
2015-10-19 15:04:14 +02:00
Micha
09a00a1f7f Add historical release notes for October 2015 bugfix releases
[skip ci]

Rebased-From: d57586f91c
Github-Pull: #6832
2015-10-15 12:49:01 +02:00
Eric Lombrozo
e42bf16ae0 Clarification of unit test build instructions. 2015-10-14 08:21:55 +00:00
Matt Corallo
54f9dee50c Update bluematt-key, the old one is long-since revoked 2015-10-14 08:21:42 +00:00
Chris Kleeschulte
bfc6154429 [Trivial] Fixed typo when referring to a previous section in
depends/README.md [skip ci]
2015-10-14 08:20:38 +00:00
Wladimir J. van der Laan
9e45157815 build: disable -Wself-assign
Prevent these warnings in clang 3.6:

    ./serialize.h:96:9: warning: explicitly assigning value of variable of type 'uint64_t' (aka 'unsigned long') to itself [-Wself-assign]
        obj = (obj);
        ~~~ ^  ~~~
2015-10-14 08:20:38 +00:00
Luke Dashjr
33d6825c6f Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case) 2015-10-14 08:20:38 +00:00