Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.16: Remaining backports for 0.16.2 #13644

Merged
merged 18 commits into from Jul 16, 2018

Conversation

Projects
None yet
@MarcoFalke
Copy link
Member

commented Jul 12, 2018

Some gui/doc/rpc/qa backports

TheBlueMatt and others added some commits Jul 10, 2018

Remove useless mapRequest tracking that just effects Qt display.
I thought we had removed this a long time ago, TBH, its really
confusing feedback to users that we display whether a tx was
broadcast to immediate neighbor nodes, given that has little
indication of whether the tx propagated very far.

Github-Pull: #13622
Rebased-From: beef7ec
[trivial] Add newlines to end of log messages.
Log messages should terminate with a '\n', or the following log will be
written to the same line without a timestamp. Fix a couple of cases
where the message is not terminated with a \n.

Github-Pull: #12887
Rebased-From: 5b10ab0
[tests] Fixed intermittent failure in p2p_sendheaders.py.
Added handling for the case where headers are announced over more than one message.
refs #12453

Github-Pull: #13192
Rebased-From: 12d1b77
[rpcwallet] Clamp walletpassphrase value at 100M seconds
Larger values seem to trigger a bug on macos+libevent (resulting in the
rpc server stopping).

Github-Pull: #12905
Rebased-From: 662d19f

@MarcoFalke MarcoFalke added the Backport label Jul 12, 2018

@MarcoFalke MarcoFalke added this to the 0.16.2 milestone Jul 12, 2018

@fanquake

This comment has been minimized.

Copy link
Member

commented Jul 12, 2018

Looks like this is missing #13452 and #13437 ?

@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Jul 12, 2018

@fanquake thanks. I will go through all master changes again and then include those two as well (and any other I find on the way)

bmwiedemann and others added some commits Apr 23, 2018

Make tests pass after 2020
also test that 64 bit integers are properly handled

Github-Pull: #13061
Rebased-From: 3ee4be1
Fix incorrect tests
Github-Pull: #13545
Rebased-From: c6fd0df

@MarcoFalke MarcoFalke force-pushed the MarcoFalke:Mf1804-16Backports branch to ed82e71 Jul 13, 2018

532479301 and others added some commits Mar 1, 2018

Consensus: Fix bug when compiler do not support __builtin_clz*
#ifdef is not correct since defination is defined to 0 or 1. Should change to #if

Github-Pull: #12573
Rebased-From: 1830784

@MarcoFalke MarcoFalke force-pushed the MarcoFalke:Mf1804-16Backports branch to b72c0bd Jul 13, 2018

@luke-jr

This comment has been minimized.

Copy link
Member

commented Jul 13, 2018

Missing:

  • #12859 (somewhat important): Bugfix: Include for std::unique_ptr
  • #12432: [qt] send: Clear All also resets coin control options
  • #12573: Fix compilation when compiler do not support __builtin_clz*
  • #12617: gui: Show messages as text not html
  • #12743: Fix csBestBlock/cvBlockChange waiting in rpc/mining
  • #12793: qt: Avoid reseting on resetguisettigs=0
  • #13149: Handle unsuccessful fseek(...):s
@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Jul 13, 2018

#12859 (somewhat important): Bugfix: Include for std::unique_ptr
#12793: qt: Avoid reseting on resetguisettigs=0

Both are included. Thanks, will look at the remaining ones...

Sjors and others added some commits Feb 14, 2018

gui: Show messages as text not html
Currently, error messages (such as InitError) are displayed as-is, which
means Qt does auto detection on the format.

This means that it's possible to inject HTML from the command line
though e.g. specifying a wallet name with HTML in it. This isn't
a direct security risk because fetching content from internet is
disabled (and as far as I know we never report strings received
from the network this way). However, it can be confusing.

So explicitly force the format as text.

Github-Pull: #12617
Rebased-From: 6fbc098
@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Jul 13, 2018

Done

@gmaxwell

This comment has been minimized.

Copy link
Member

commented Jul 13, 2018

ACK

1 similar comment
@achow101

This comment has been minimized.

Copy link
Member

commented Jul 13, 2018

ACK

@fanquake

This comment has been minimized.

Copy link
Member

commented Jul 14, 2018

utACK 21dd512

@MarcoFalke MarcoFalke force-pushed the MarcoFalke:Mf1804-16Backports branch to d9c5630 Jul 14, 2018

@MarcoFalke

This comment has been minimized.

Copy link
Member Author

commented Jul 14, 2018

Pushed a commit to fix a test debugging issue reported by a user on the bitcoin-dev mailing list.

https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2018-July/016255.html

@sipa

This comment has been minimized.

Copy link
Member

commented Jul 14, 2018

utACK d9c5630

@gmaxwell

This comment has been minimized.

Copy link
Member

commented Jul 15, 2018

re-ACK

@fanquake

This comment has been minimized.

Copy link
Member

commented Jul 15, 2018

re-utACK d9c5630

@laanwj

This comment has been minimized.

Copy link
Member

commented Jul 16, 2018

utACK d9c5630

@laanwj laanwj merged commit d9c5630 into bitcoin:0.16 Jul 16, 2018

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jul 16, 2018

Merge #13644: 0.16: Remaining backports for 0.16.2
d9c5630 qa: Initialize lockstack to prevent null pointer deref (MarcoFalke)
21dd512 gui: Show messages as text not html (Wladimir J. van der Laan)
f78e7f6 [qt] send: Clear All also resets coin control options (Sjors Provoost)
657dfc5 Fix csBestBlock/cvBlockChange waiting in rpc/mining (Pieter Wuille)
88d1a64 Consensus: Fix bug when compiler do not support __builtin_clz* (532479301)
b72c0bd [qa] Add a test for merkle proof malleation (Suhas Daftuar)
6b9dc8c have verifytxoutproof check the number of txns in proof structure (Gregory Sanders)
ed82e71 wallet: Erase wtxOrderd wtx pointer on removeprunedfunds (MarcoFalke)
e15e3a9 Remove boost dependency (boost/assign/std/vector.hpp) (practicalswift)
1062199 Fix incorrect tests (practicalswift)
170b309 Make tests pass after 2020 (Bernhard M. Wiedemann)
cfc6f74 [rpcwallet] Clamp walletpassphrase value at 100M seconds (Suhas Daftuar)
bf1f150 rpc: fix type mistmatch in listreceivedbyaddress (joemphilips)
2291774 [trivial] Add newlines to end of log messages. (John Newbery)
cf6feb7 qt: Avoid resetting on resetguisettigs=0 (MarcoFalke)
cbdabef qa: Fix wallet_listreceivedby race (MarcoFalke)
79c4fff [tests] Fixed intermittent failure in p2p_sendheaders.py. (lmanners)
c04a4a5 Remove useless mapRequest tracking that just effects Qt display. (Matt Corallo)

Pull request description:

  Some gui/doc/rpc/qa backports

Tree-SHA512: f1e918d2ca6016fc7c5d5adf5d537553a1769731e2dcac788edf02c7354387861ec5bcd0cbf3c833c1485d500c55a73a2799a8b39ed14477524ac46b4ff2332d

@MarcoFalke MarcoFalke deleted the MarcoFalke:Mf1804-16Backports branch Jul 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.