Skip to content

[0.12 branch] Backports #9211

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 5 commits into from
Dec 14, 2016
Merged

[0.12 branch] Backports #9211

merged 5 commits into from
Dec 14, 2016

Conversation

maflcko
Copy link
Member

@maflcko maflcko commented Nov 23, 2016

No description provided.

MarcoFalke and others added 2 commits November 23, 2016 13:23
[rpcwallet] Don't use floating point
ad99a79 
Github-Pull: bitcoin#8317
Rebased-From: 477777f
@ryanofsky
Send tip change notification from invalidateblock
cca151b 
This change is needed to prevent sync_blocks timeouts in the mempool_reorg
test after the sync_blocks update in the upcoming commit
"[qa] Change sync_blocks to pick smarter maxheight".

This change was initially suggested by Suhas Daftuar <sdaftuar@chaincode.com>
in bitcoin#8680 (comment)

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
@maflcko maflcko added this to the 0.12.2 milestone Nov 23, 2016
@TheBlueMatt
Copy link
Contributor

If we're not gonna backport segwit, I don't think we want another 12.X release.

On November 23, 2016 4:28:26 AM PST, MarcoFalke notifications@github.com wrote:

You can view, comment on, or merge this pull request online at:

#9211

-- Commit Summary --

  • [rpcwallet] Don't use floating point
  • Send tip change notification from invalidateblock

-- File Changes --

M src/main.cpp (1)
M src/wallet/rpcwallet.cpp (6)

-- Patch Links --

https://github.com/bitcoin/bitcoin/pull/9211.patch
https://github.com/bitcoin/bitcoin/pull/9211.diff

You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
#9211

@maflcko maflcko changed the title [0.12.2] Backports [0.12 branch] Backports Nov 24, 2016
@maflcko
Copy link
Member Author

maflcko commented Nov 24, 2016

Right, there won't be a release on the 0.12 branch, so I changed the title and milestone.

Though, we still fix bugs on the 0.12 branch, as the maintenance end is not reached. Not sure if the invalidateblock bugfix qualifies for backport, but lets see what others think.

@laanwj
torcontrol: Explicitly request RSA1024 private key
82e29e8 
When generating a new service key, explicitly request a RSA1024 one.

The bitcoin P2P protocol has no support for the longer hidden service names
that will come with ed25519 keys, until it does, we depend on the old
hidden service type so make this explicit.

See bitcoin#9214.

Github-Pull: bitcoin#9234
Rebased-From: 7d3b627
@maflcko maflcko mentioned this pull request Nov 30, 2016
Merged
@laanwj laanwj merged commit d609895 into bitcoin:0.12 Dec 14, 2016
laanwj added a commit that referenced this pull request Dec 14, 2016
@laanwj
Merge #9211: [0.12 branch] Backports
c1b7421 
d609895 [Wallet] Bugfix: FRT: don't terminate when keypool is empty (Jonas Schnelli)
8dee97f [QA] add fundrawtransaction test on a locked wallet with empty keypool (Jonas Schnelli)
82e29e8 torcontrol: Explicitly request RSA1024 private key (Wladimir J. van der Laan)
cca151b Send tip change notification from invalidateblock (Russell Yanofsky)
ad99a79 [rpcwallet] Don't use floating point (MarcoFalke)
@maflcko maflcko deleted the Mf1611-back12 branch December 14, 2016 11:20
@maflcko maflcko mentioned this pull request Dec 14, 2016
Merged
@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.
Reviewers
No reviews
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
0.12.branch
Development

Successfully merging this pull request may close these issues.
5 participants
@maflcko @TheBlueMatt @laanwj @ryanofsky @jonasschnelli