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

commits from bitcoin/master #320

Merged
merged 7 commits into from May 4, 2018
Merged

commits from bitcoin/master #320

merged 7 commits into from May 4, 2018

Conversation

Bushstar
Copy link
Collaborator

@Bushstar Bushstar commented May 4, 2018

Interrupt rescan on shutdown request
bitcoin/bitcoin#12507

Get rid of ambiguous OutputType::NONE value
bitcoin/bitcoin#12729

Trivial: s/SetBestChain/ChainStateFlushed in comments after #13106
bitcoin/bitcoin#13154

logging: Fix potential use-after-free in LogPrintStr(...)
bitcoin/bitcoin#13148

Reduce cs_main lock in listunspent
bitcoin/bitcoin#12639

promag and others added 7 commits May 4, 2018 07:48
Based on suggestion by Pieter Wuille <pieter.wuille@gmail.com> at
bitcoin/bitcoin#12119 (comment)

After #12119, the NONE output type was overloaded to refer to either an output
type that couldn't be parsed, or to an automatic change output mode.  This
change drops the NONE enum and uses a simple bool indicate parse failure, and a
new CHANGE_AUTO enum to refer the change output type.

This change is almost a pure refactoring except it makes RPCs reject empty
string ("") address types instead of treating them like they were unset. This
simplifies the parsing code a little bit and could prevent RPC usage mistakes.
It's noted in the release notes.
`LogPrintStr` returns the number of characters printed. This number is
doubled if both logging to console and logging to file is enabled. As
the return value is never used, I've opted to remove it instead of try
to fix it.

Credit: @laanwj
@Bushstar Bushstar merged commit 2e9008b into FeatherCoin:master May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants