[0.17] Backports

MarcoFalke commented at 1:21 pm on September 26, 2018: member

MarcoFalke added the label Backport on Sep 26, 2018

fanquake added this to the milestone 0.17.0 on Sep 27, 2018

laanwj removed this from the milestone 0.17.0 on Sep 29, 2018

laanwj added this to the milestone 0.17.1 on Sep 29, 2018

laanwj commented at 12:25 pm on September 29, 2018: member

changed milestone to 0.17.1, I don’t think anything here warrants a new rc

fanquake commented at 11:18 pm on October 1, 2018: member

Could include #14298

MarcoFalke force-pushed on Oct 4, 2018

fanquake commented at 4:25 am on October 9, 2018: member

Merged b169519 and ran the functional tests, currently one failure: example_test.py

0example_test.py failed, Duration: 0 s
1stderr:
2Traceback (most recent call last):
3  File "/Users/michael/github/bitcoin/test/functional/example_test.py", line 18, in <module>
4    from test_framework.mininode import (
5ImportError: cannot import name 'CInv' from 'test_framework.mininode' (/Users/michael/github/bitcoin/test/functional/test_framework/mininode.py)

fanquake commented at 3:24 am on October 10, 2018: member

ACK 4ffdf50

Merged 4ffdf50 and ran the --extended tests. Would be good to get this merged soon so that test changes are in before the rest of the backports.

fanquake commented at 1:15 am on October 24, 2018: member

Would suggest also adding #14011 cc @ryanofsky. edit: Also #14424, as that is the only other merged needs-backport PR.

fanquake commented at 11:36 pm on October 24, 2018: member

Travis output:

 0script/sign.cpp: In function ‘bool CreateSig(const BaseSignatureCreator&, SignatureData&, const SigningProvider&, std::vector<unsigned char>&, const CPubKey&, const CScript&, SigVersion)’:
 1script/sign.cpp:80:5: error: ‘KeyOriginInfo’ was not declared in this scope
 2     KeyOriginInfo info;
 3     ^~~~~~~~~~~~~
 4script/sign.cpp:81:18: error: ‘const class SigningProvider’ has no member named ‘GetKeyOrigin’; did you mean ‘GetKey’?
 5     if (provider.GetKeyOrigin(keyid, info)) {
 6                  ^~~~~~~~~~~~
 7                  GetKey
 8script/sign.cpp:81:38: error: ‘info’ was not declared in this scope
 9     if (provider.GetKeyOrigin(keyid, info)) {
10                                      ^~~~
11script/sign.cpp:81:38: note: suggested alternative: ‘int’
12     if (provider.GetKeyOrigin(keyid, info)) {
13                                      ^~~~
14                                      int

MarcoFalke force-pushed on Oct 25, 2018

MarcoFalke referenced this in commit 76dd5257f9 on Oct 28, 2018

MarcoFalke force-pushed on Oct 28, 2018

luke-jr commented at 5:59 pm on October 29, 2018: member

#14298 is not a bug fix…

MarcoFalke force-pushed on Nov 19, 2018

MarcoFalke commented at 6:06 pm on November 19, 2018: member

Added commits that fix issues with valgrind running bench_bitcoin and test_bitcoin.

Edit: Other than that, the other backports should only affect tests and are clean cherry-picks except one commit.

[wallet] Ensure wallet is unlocked before signing

Github-Pull: #14310
Rebased-From: db15805668e923c3493d77122d20926496cf6a1a

bb90695551

Add autogen.sh in ARM Cross-compilation

autogen for the config files was missing.

Github-Pull: #14276
Rebased-From: 52beb9ed8876e3129360197ac632c1b59f910c55

85aacc41ba

add a test demonstrating an overflow in a deserialization edge case

Also add a test that the highest legal index is accepted.

Github-Pull: #14685
Rebased-From: 051faf7e9d4e32142f95f7adb31d2f53f656cb66

94065024c7

fix a deserialization overflow edge case

A specially-constructed BlockTransactionsRequest can overflow in
deserialization in a way that is currently harmless.

Github-Pull: #14685
Rebased-From: 6bed4b374daf26233e96fa7863d4324a5bfa99c2

5331ad0506

disallow oversized CBlockHeaderAndShortTxIDs

Otherwise we'd reply with a bogus BlockTransactionsRequest trying to
request indexes with overflowed deltas.

Github-Pull: #14685
Rebased-From: b08af10fb299dc3fdcd1f022619fb112c72e5d8e

2f9fd29321

qa: Add test to ensure node can generate all help texts at runtime

Github-Pull: #14658
Rebased-From: bbbbb3f8850907d413db4715c10ef6df055234f6

60f7a97930

Tests: Fix a comment

Github-Pull: #14632
Rebased-From: 086fc835718555bb332a807fe5794cb6cb4d1fef

96f15e8bb3

wallet: Avoid potential use of unitialized value bnb_used in CWallet::CreateTransaction(...)

Github-Pull: #13546
Rebased-From: a23a7f60aa07de52d23ff1f2034fc43926ec3520

91fa15aaeb

Fix listreceivedbyaddress not taking address as a string

Fixes #14173. Add the patch in #14173 and include a regression test.

Github-Pull: #14417
Rebased-From: d4d70eda339f6f74390b56edd4021e928bb588a7

fb9ad043f8

build: Remove illegal spacing in darwin.mk

Github-Pull: #14647
Rebased-From: 63c74d2d3abcb685c773c3ad1414da6ad062a55d

7edebedef1

build: Add bitcoin-tx.exe into Windows installer

Github-Pull: #14698
Rebased-From: 5c5902acc515c8f46ad73222cd57a29c4c13b92c

ec71f06a8d

travis: Remove deprecated sudo 542651cfb4

MarcoFalke force-pushed on Nov 28, 2018

MarcoFalke commented at 8:38 pm on November 28, 2018: member

Rebased on current 0.17 branch. Note that GitHub shows the commits in a different order.

ryanofsky approved

ryanofsky commented at 8:43 pm on November 28, 2018: member

utACK 542651cfb408d10e6eaaa24ad985c95e51f88f75. Verified using the script in #11592#pullrequestreview-73922693 that commits in this PR were cherry-picked correctly, and tagged with the right PR numbers, and merged previously to master.

(Two commits bb9069555120474a53caf55027c2bdc1d4cf383c and fb9ad043f8b82c7d507ee729121658073eb894f8 had minor conflicts that appeared to be resolved correctly, and one commit 542651cfb408d10e6eaaa24ad985c95e51f88f75 was not a cherry-pick.)

MarcoFalke merged this on Nov 28, 2018

MarcoFalke closed this on Nov 28, 2018

MarcoFalke referenced this in commit 9f556622c5 on Nov 28, 2018

MarcoFalke deleted the branch on Nov 28, 2018

DrahtBot locked this on Sep 8, 2021

[0.17] Backports #14328