[WIP] Backports for 0.10.5 (updated to 93ca5a3) #7186

luke-jr commented at 7:13 AM on December 8, 2015: member

No description provided.

Bugfix: Use unique autostart filenames on Linux for testnet/regtest 2aa49ce9fe

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: 22e780737db57bcb18b3824eb8158e19a4775cb6
Github-Pull: #6948

b7fcc14008

Clean up tx prioritization when conflict mined

Github-Pull: #6464
Rebased-From: 2d8c49d126bf2551ef0268f314ab75932fa96510

910bb77910

Update to my new key

Github-Pull: #6895
Rebased-From: 4252cd09fd729b0d8a9d53c0308f54b3a798c372

a62884e11f

[trivial] rpcnet: fix typo

Github-Pull: #6870
Rebased-From: bf681918d7ef5c4bc6f92465ae7922c9f4b03d93

e8d9550f54

unittest: fix test for null tx input

Update the unittest that is meant to catch a transaction that is invalid
because it has a null input.  The old test failed not because of that
but because it was considered a coinbase with too large script.  This is
already checked with a different test, though.

The new test is *not* a coinbase since it has two inputs, but one of
them is null.  This really checks the corresponding code path in
CheckTransaction.

Github-Pull: #6863
Rebased-From: 0be387a536f03a1dd0df66176fc354fb0895be48

fca4cf193e

Reject invalid pubkeys when reading ckey items from the wallet.

This makes the behavior more consistent with key objects and will
 reject some corrupted pubkeys (e.g. zero length).

Github-Pull: #6906
Rebased-From: 30d9662bd780e298516d514984ced1f88ec5bc3b

f1c208d153

Bugfix: RPC: blockchain: Display correct defaults in help for verifychain method

Github-Pull: #6905
Rebased-From: caa3d42f0689bd945c5b544fe0ebe2ca25acd180

45f2e9d3d1

Bugfix: Describe dblogsize option correctly (it refers to the wallet database, not memory pool)

Github-Pull: #6905
Rebased-From: 420a82f1ae2f56938ea935fbdbb60e47685684c7

20b079b4b2

Bugfix: If genproclimit is omitted to RPC setgenerate, don't change it; also show correct default in getmininginfo

Github-Pull: #6905
Rebased-From: 5f9260f45843e5b0e1f4156af0f7b6d6c2d93a76

b049e29c34

Bugfix: Omit wallet-related options from -help when wallet is disabled

Github-Pull: #6905
Rebased-From: a6efc019085fd70790ad7fa97078ce02d8f8dec3

ab99a5bb72

rpc-tests: Backport test of validateaddress with -disablewallet

Github-Pull: #6970
Rebased-From: 2980a18572dbe6173c41afc037b0cefe367d935c

312cf155cf

build: fix building against qt5.4/5.5

Github-Pull: #6471
Rebased-From: fe997dfd121e3d82464908940753b77ebf61a10d

f3995f0485

build: Split hardening/fPIE options out

This allows for fPIE to be used selectively.

Github-Pull: #6978
Rebased-From: 17c4d9d1647bbac4b0557136b1c3d98c951feb79

f016923570

build: Use fPIC rather than fPIE for qt objects.

But only if qt was built with reduced relocations.

Github-Pull: #6978
Rebased-From: 69d05134367da9a897ad14562a1d266750db450a

d6fc10cdc0

Merge commit 'd6fc10c' into backports-for-0.10.5 6a5ddc49fc

Remove LOCK(cs_main) from decodescript

Completely static RPC call that doesn't change or even look at mutable
state anywhere.

Github-Pull: #7013
Rebased-From: b3ae384a8d1606948427b7bd2059d781a779b62a

28262da0ea

Fixed integer comparison warning.

Github-Pull: #7023
Rebased-From: 4d29032a6437eaa147a69ce2857fb243bf3a1e49

37ac133328

Fix debug log message for block files

Github-Pull: #7050
Rebased-From: e855b0152fa9d23fd49ccdd1b8e9427826b44a67

e9ffec1716

[doc][trivial] Remove source forge from Debian watch.

Github-Pull: #7042
Rebased-From: 2fcb84907d793dcf0952ceff069c97866079c2e0

b9becca07a

Merge pull request #7045 (rewrite)

2aa49ce Bugfix: Use unique autostart filenames on Linux for testnet/regtest (Luke Dashjr)

ce2809aef6

Add missing "blocktime" description to listtransactions help.

Github-Pull: #7066
Rebased-From: 5c2fd38d05b0da2fa0d1ec99f1db55b0d89180db

51a4bb47df

build: Set osx permissions in the dmg to make Gatekeeper happy

Github-Pull: #7092
Rebased-From: 392d3c5846db69dcbcc448d7504d0e4e73832ecf

4ea291f04f

OpenSSL 1.1.0: Fix text variant of the version number

Github-Pull: #7083
Rebased-From: faf12bc2839d0a858b36c371aaf26902e49e380c

3c5d1d1b01

Bugfix: Omit wallet-related options from -help when wallet is not supported

Github-Pull: #6961
Rebased-From: 3307bdb3331732e781c77a88ef7053fe23c78701

72c9ac6180

Add function to convert CValidationState to a human-readable message

It is necessary to be able to concisely log a validation state.
Convert CValidationState to a human-readable message for logging.

Github-Pull: #6519
Rebased-From: 9003c7cdd88402986e48ec126258fc10d6742fc7

efe69c81ed

[doc] Minor markdown fixes

Github-Pull: #7136
Rebased-From: fad3035e8d84dd3cbd166b9722127da373d34554

9e26e8a0e1

contrib: update gitian README

Github-Pull: #7136
Rebased-From: fa22a1002873fb222a7ddb8d00c2bd727293ac13

17966aca16

Fix url in .travis.yml

Github-Pull: #7136
Rebased-From: 9999cb0626750c912097c73a1ef5c50435a922e3

f41b28e5c9

Fix various typos

Github-Pull: #7157
Rebased-From: 8a03727d9cc975a3d0843d83ef05957b9e9fbbca

295a915137

[trivial] Fix typo in peertablemodel.cpp

Github-Pull: #7157
Rebased-From: e69bad19f8d314862f53a7e0acc52247c9662275

7f39a86cf8

Update miner.cpp: Fix typo in comment

Github-Pull: #7157
Rebased-From: 74f7341fecd327587cba77db3fc1455efcaa20be

7864393c7d

Add missing automake package to deb-based UNIX install instructions.

Github-Pull: #7152
Rebased-From: b4404090259be4e34ef5dba33e47a41e7d9acc03

55763eca17

[contrib] Update versionprefix to "bitcoin-core" in verify.sh

Github-Pull: #7026
Rebased-From: 141c44ed6549acdc7f49fe039f017c020490ccf1

8f110c28a8

[trivial] contrib: Fix `echo`s in verify.sh

Github-Pull: #7026
Rebased-From: a6d5a6502a3dce23679a9be9e4884a4f77110cd1

8b3ae4bcbc

luke-jr renamed this:
~~Backports for 0.10.5 (updated to dc0305d)~~
[WIP] Backports for 0.10.5 (updated to dc0305d)
on Dec 8, 2015

rpc: remove cs_main lock from `createrawtransaction`

This is a pure utility function that doesn't use
main's data structures, so it does not require that lock.

Github-Pull: #7156
Rebased-From: 6e765873605ee5e31652ce107848a157151791b4

73e32e3dbf

Add a NODE_GETUTXO service bit and document NODE_NETWORK.

Stop translating the NODE_* names as they are technical and cannot be translated.

Github-Pull: #5876
Rebased-From: 5983a4e50f2c3f53024d9a5cecab69f67c882cca

b595fc90c8

Recognise NODE_BLOOM service bit in protocol.h (not used in this version)

Github-Pull: #6579
Partial-Rebased-From: afb0ccaf9c9e4e8fac7db3564c4e19c9218c6b03

bfa763aea0

Add "NODE_BLOOM" to guiutil so that peers don't get UNKNOWN[4]

Github-Pull: #7206
Rebased-From: daf6466330d9d3e4d9034fd316cded192d2a7d67

9e5e6ed526

[RPC-Tests] add option to run rpc test over QT clients

Github-Pull: #7068
Rebased-From: 979698c1715ce86a98934e48acadbc936c95c9a3

05e9b642b0

checks for null data transaction before debug.log

CWalletTx::GetAmounts could not find output address for null data transactions, thus issuing an error in debug.log. This change checks to see if the transaction is OP_RETURN before issuing error.

resolves #6142

Github-Pull: #7200
Rebased-From: b6915b82398d2e1d1f888b3816adfaf06d9a450e

3ff334b7ad

wallet: check if tx scriptPubKey is unspendable

Github-Pull: #7200
Rebased-From: c611acc38a95d336a824b632823aa1b652e570df

0f085580c5

fix logic for error log

Github-Pull: #7200
Rebased-From: d812daf967ba4173bfa1c37eeb4ab7a0ccc4df25

7509c86e73

Rename OP_NOP2 to OP_CHECKLOCKTIMEVERIFY.

Github-Pull: #7213
Rebased-From: 37d271d7cce44885f835292ffe99b54399b014d6

8f6b971a58

Adapt decodescript test to 0.10 RPC 7b19f3873f

luke-jr renamed this:
~~[WIP] Backports for 0.10.5 (updated to dc0305d)~~
[WIP] Backports for 0.10.5 (updated to 97d8373)
on Dec 28, 2015

Fix getblocktemplate_proposals test by mining one block

This triggers the tested node to no longer be in initial
download, allowing the call to getblocktemplate() to succeed.

Github-Pull: #5756
Rebased-From: 1cb2a00cb8221841e7d748ed49fd2ea0ad50ac12

d4e0b379d5

Fix BIP65 p2p test

create_coinbase() was being called with the wrong arguments

Github-Pull: #6894
Rebased-From: 3e187f2acdb69ceb97a875f8f3bf361c11ef543c

319cde4240

Bugfix: Port unit tests so they work

- Import new_test_framework from 0.11 and adapt tests that need it
- Bugfix: Properly backport qa/rpc-tests/disablewallet
- Bugfix: Properly backport qa/rpc-tests/bip65-cltv

2ec6869d6d

MarcoFalke commented at 3:55 PM on January 9, 2016: member

#7259 could make sense for 0.10.5, imo.

typofixes (found by misspell_fixer)

Github-Pull: #6539
Rebased-From: 9f68ed6b6d1a9c6436ce37913666165f2b180ee3

29e3d6c616

Fix spelling mistake in -> if.

Github-Pull: #6544
Rebased-From: c5c1edfe6035791973d419ae72cbf24342ee7e4c

b326b33cd8

configure --enable-debug changes

Three changes to how configure --enable-debug behaves:

1. Preserve user-passed CXXFLAGS/CFLAGS
2. Compile with -DDEBUG_LOCKORDER
3. Add -DDEBUG -DDEBUG_LOCKORDER to CPPFLAGS (since they are preprocessor options)

Github-Pull: #6434
Rebased-From: 83b48c89718e7b3fc2b180be992446a068f7fdcc

4be978311d

fix CBitcoinExtKeyBase template

- fix Decode call (req. only one param)

Github-Pull: #6468
Partial-Rebased-From: 7cb1f9f7eb8162a792b4b87bba99fa21c682582e

59d8614054

fix and extend CBitcoinExtKeyBase template

- fix Decode call (req. only one param)
- add constructor for base58c->CExtKey

Github-Pull: #6468
Rebased-From: 7cb1f9f7eb8162a792b4b87bba99fa21c682582e

1157680fea

extend bip32 tests to cover Base58c/CExtKey decode

Github-Pull: #6468
Rebased-From: 8d2af54eccda83bfe86bb14069ad54d0e4ba357c

04962bb6ec

don't try to decode invalid encoded ext keys

Github-Pull: #6468
Rebased-From: 6f8b6d339bf6d6f7fe5a23180e668f7734755d91

95bd773a64

Add note on relative paths, improve formatting

Added "conf, pid, and wallet accept relative paths which are interpreted as relative to the data directory. wallet only supports relative paths."
Github-Pull: #6512
Rebased-From: fc25a8748eefe3cb62be93d9804ef3f9e17b78cc

dcfe230b44

Reformat validateaddress help, add missing iswatchonly description.

Github-Pull: #6541
Rebased-From: e0862c0933bc809ef1087e3e0a3ee8cd76b04ac9

7683e35801

Correct a possibly intentional pun that is nevertheless hard to read: "two times of nLockTime." What is meant is that there are two kinds, or categories of nLockTime.

Github-Pull: #6544
Rebased-From: e846b2a1e96f27257cbb79f7f61bfaf3d873bb97

c5d0e7ab48

Make limited map actually respect max size

Github-Pull: #6561
Rebased-From: fd2d862fbc4d13129bfa3702a9241d9ea46ddae5

49e9a861eb

Fix removal of time-locked transactions during reorg

Github-Pull: #6595
Rebased-From: 2276af1501931e05979d11921d1f9104f0013e9f

2e052f4be8

Fix comment in removeForReorg

Github-Pull: #6595
Rebased-From: b394d266def649088c08619cd32b923ed8ab3c89

45f5d23185

Fixes typo in build-osx.md.

Github-Pull: #6663
Rebased-From: 5d7a16d073bfc37f429b71c411f5bdcce8bfe79b

47cf6001a7

build: remove libressl check

Now that BIP66 passed, OpenSSL is no longer directly part of the
consensus. What matters is that DER signatures are correctly parsed, and
secp256k1 crypto is implemented correctly (as well as the other
functions we use from OpenSSL, such as random number generation)

This means that effectively, using LibreSSL is not a larger risk than
using another version of OpenSSL.

Remove the specific check for LibreSSL.

Includes the still-relevant part of #6729: make sure CHECK_HEADER is
called using the right CXXFLAGS, not CFLAGS (as AC_LANG is c++).

Github-Pull: #6732
Rebased-From: 59783884766d00866e190ba5ae761916e932df10

ed06991bcf

The Bitcoin Core project is releasing Bitcoin Core, not Bitcoin.

Github-Pull: #6763
Rebased-From: 202f612a415f2b32332701bc15f28bd6fab49ebb

a8b5fd33dc

Add DERSIG transaction test cases

Add test cases for DERSIG flag enforcement against transactions.

Github-Pull: #6848
Rebased-From: c6824f8a90e33277de4db826bf1c65692a67be47

066e41025b

Move windows socket init to utility function

Github-Pull: #5677
Rebased-From: 26c9b836778cbaf9b9ccb9b92e841d7bd6ea2fdc

2fde236d23

tests: Initialize networking on windows

Github-Pull: #6926
Rebased-From: 7497e805bd437b07fc3e5920f0c1f84bf10b0ebe

7d901479d6

doc: Remove mention of pulltester from README.md

We've switched to Travis CI a long time ago.

Github-Pull: #6998
Rebased-From: 01afa809cef688ff7f5af491005ba4abd3cd4098

3583500546

[qa] travis: cover *receivedby* rpcs

Github-Pull: #7019
Rebased-From: 33b7f83c593456c08d2be3edef785bb4a3850368

1407c705ab

[doc][trivial] Remove miniupnpc build notes build-unix

Github-Pull: #7048
Rebased-From: c5f211bbd0ab11e217836f0b12237bcc02f5a638

6821639c4b

Assert now > 0 in GetTime GetTimeMillis GetTimeMicros

Previously all of these functions could return negative values (for different
readons).  Large portions of the codebase currently assume that these
functions return positive values.

Github-Pull: #7094
Rebased-From: 1bb289fe1b7d240e0d58ef13da30e45590231078

2c7ba8ddf9

Partial: [qa] pull-tester: run keypool

* Run keypool (takes 6 seconds)

Github-Pull: #7135
Rebased-From: fa3a38a7f269f7a33c6176975f171b93025f05d7

4d92b13953

Set link from http:// to https://

For opensource.org/licenses/MIT!
Github-Pull: #7197
Rebased-From: 00423e1a71204696ec37e6d757f9afe091bc7ee1

ad72dbf0c2

qt5: Use the fixed font the system recommends

Github-Pull: #7214
Rebased-From: fa2f4bc4eb0f21f5be8c88954ae2d99c5b18b987

a1af9051fd

Removed offline testnet DNSSeed 'alexykot.me'.

Github-Pull: #7216
Rebased-From: e18378e53fb71c39236db35ab2d560b43602b1be

7ed7b0a5eb

test: Add basic test for `reject` code

Extend P2P test framework to make it possible to expect reject
codes for transactions and blocks.

Github-Pull: #7179
Rebased-From: 20411903d7b356ebb174df2daad1dcd5d6117f79

3e167cfddd

Bugfix: update-translations: Allow numerus translations to omit %n specifier (usually when it only has one possible value)

Github-Pull: #7253
Rebased-From: 0d595894f028248a1a1b00491dad95320844c685

a5d3030cb3

Replace some instances of formatWithUnit with formatHtmlWithUnit

Strings in a HTML context should be using formatHtmlWithUnit.

Github-Pull: #7255
Rebased-From: 5fdf32de7ed85a1a0aec7cdedb83f750f4a0f7ff

966acb06da

Remove hardcoded fee from CoinControl ToolTip

Github-Pull: #7255
Rebased-From: 6fd0a079d8f9fa552d84be7a6787b1165b99b302

1d9663fba7

Report non-mandatory script failures correctly

Github-Pull: #7276
Rebased-From: 7ef8f3c072a8750c72a3a1cdc727b5c1d173bac8

eea84de6b0

[Qt] fix coincontrol update issue when deleting a send coin entry

Github-Pull: #7282
Rebased-From: 621bd6919f47be4d23091d8ae7c980f9567d83a9

a220ee6351

[qt] Intro: Display required space

Required space depends on the user's choice:
 -prune=0
 -prune=<n>

Github-Pull: #7298
Rebased-From: faf3299b73ccb5044b7eaced229ac0c904aa25f5

4d056221a9

luke-jr renamed this:
~~[WIP] Backports for 0.10.5 (updated to 97d8373)~~
[WIP] Backports for 0.10.5 (updated to 93ca5a3)
on Jan 10, 2016

[dbwrapper] Detect obfuscation

Github-Pull: #7259
Rebased-From: fa24941c46fe0663efa081326940099313df292f

4124498ea4

[init] Fix typo

Github-Pull: #7259
Rebased-From: fa3cb4946f917111bd106c5f79a2d614d6e990f4

4d548f6fdc

Fix various warnings

Found while building on Debian 7

Github-Pull: #6133
Rebased-From: e617fe25785bfba30bcb0a8d8af6797b44ba07f5

d89d0ebba8

When processing RPC commands during warmup phase, parse the

request object before returning an error so that id value can
be used in the response.

Prior to this commit, RPC commands sent during Bitcoin's
warmup/startup phase were responded to with a JSON-RPC error
with an id of null, which violated the JSON-RPC 2.0 spec:

id: This member is REQUIRED. It MUST be the same as the value
of the id member in the Request Object. If there was an error
in detecting the id in the Request object (e.g. Parse
error/Invalid Request), it MUST be Null.

Github-Pull: #6362
Rebased-From: 72b9452b1d5ff8761466e9810facfd50103cc63b

d60afa17b0

prevent peer flooding request queue for an inv

mapAlreadyAskedFor does not keep track of which peer has a request queued for a
particular tx. As a result, a peer can blind a node to a tx indefinitely by
sending many invs for the same tx, and then never replying to getdatas for it.
Each inv received will be placed 2 minutes farther back in mapAlreadyAskedFor,
so a short message containing 10 invs would render that tx unavailable for 20
minutes.

This is fixed by disallowing a peer from having more than one entry for a
particular inv in mapAlreadyAskedFor at a time.

Github-Pull: #7079
Rebased-From: 5029698186445bf3cd69d0e720f019c472661bff

b83ab95d8d

Limit setAskFor and retire requested entries only when a getdata returns.

The setAskFor duplicate elimination was too eager and removed entries
 when we still had no getdata response, allowing the peer to keep
 INVing and not responding.

Github-Pull: #7079
Rebased-From: ebb25f4c23adbcb55796c402bafd6064a136f16f

0d43146081

MarcoFalke commented at 5:05 PM on January 10, 2016: member

utACK 0d43146. Note: This also includes OP_CHECKLOCKTIMEVERIFY, which is not in 0.12.0

luke-jr commented at 6:28 PM on January 10, 2016: member

Note: This also includes OP_CHECKLOCKTIMEVERIFY, which is not in 0.12.0

??? How is it not in 0.12.0?

MarcoFalke commented at 10:31 AM on January 11, 2016: member

probably won't release this until v0.13

MarcoFalke commented at 2:13 PM on March 14, 2016: member

Has a merge conflict.

MarcoFalke commented at 2:26 PM on March 14, 2016: member

Also https://bitcoincore.org/en/lifecycle/ says 0.10 Maintenance End was 2016-02-29; so is this pull kept open for interested developers/users but not merged?

Related fun fact: 0.10.4 is not yet released: #7595 (comment)

luke-jr commented at 3:48 AM on March 15, 2016: member

@MarcoFalke The website is wrong for Maint. End.

arowser commented at 8:45 AM on May 25, 2016: contributor

Can one of the admins verify this patch?

laanwj commented at 8:25 AM on June 9, 2016: member

Needs rebase (or close).

laanwj added the label Backport on Jun 9, 2016

laanwj closed this on Jun 14, 2016

DrahtBot locked this on Sep 8, 2021