Skip to content

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Jul 12, 2018

Some gui/doc/rpc/qa backports

TheBlueMatt and others added 7 commits July 12, 2018 09:49
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: bitcoin#13622
Rebased-From: beef7ec
Added handling for the case where headers are announced over more than one message.
refs bitcoin#12453

Github-Pull: bitcoin#13192
Rebased-From: 12d1b77
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: bitcoin#12887
Rebased-From: 5b10ab0
Larger values seem to trigger a bug on macos+libevent (resulting in the
rpc server stopping).

Github-Pull: bitcoin#12905
Rebased-From: 662d19f
@maflcko maflcko added this to the 0.16.2 milestone Jul 12, 2018
@fanquake
Copy link
Member

Looks like this is missing #13452 and #13437 ?

@maflcko
Copy link
Member Author

maflcko 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 4 commits July 12, 2018 10:27
also test that 64 bit integers are properly handled

Github-Pull: bitcoin#13061
Rebased-From: 3ee4be1
Github-Pull: bitcoin#13545
Rebased-From: c6fd0df
@maflcko maflcko force-pushed the Mf1804-16Backports branch from 32fce4e to ed82e71 Compare July 13, 2018 15:51
instagibbs and others added 4 commits July 13, 2018 12:23
@maflcko maflcko force-pushed the Mf1804-16Backports branch from 21966b4 to b72c0bd Compare July 13, 2018 16:24
@luke-jr
Copy link
Member

luke-jr commented Jul 13, 2018

Missing:

@maflcko
Copy link
Member Author

maflcko 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 2 commits July 13, 2018 13:33
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: bitcoin#12617
Rebased-From: 6fbc098
@maflcko
Copy link
Member Author

maflcko commented Jul 13, 2018

Done

@gmaxwell
Copy link
Contributor

ACK

1 similar comment
@achow101
Copy link
Member

ACK

@fanquake
Copy link
Member

utACK 21dd512

@maflcko maflcko force-pushed the Mf1804-16Backports branch from 668ece0 to d9c5630 Compare July 14, 2018 15:18
@maflcko
Copy link
Member Author

maflcko 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
Copy link
Member

sipa commented Jul 14, 2018

utACK d9c5630

@gmaxwell
Copy link
Contributor

re-ACK

@fanquake
Copy link
Member

re-utACK d9c5630

@laanwj
Copy link
Member

laanwj commented Jul 16, 2018

utACK d9c5630

@laanwj laanwj merged commit d9c5630 into bitcoin:0.16 Jul 16, 2018
laanwj added a commit that referenced this pull request Jul 16, 2018
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
@maflcko maflcko deleted the Mf1804-16Backports branch July 16, 2018 13:13
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.