/bitcoin

[0.12 branch] Backports #9211

Merged
merged 5 commits into from Dec 14, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
Backport
Projects
None yet
Milestone
  0.12.branch
5 participants
@MarcoFalke @TheBlueMatt @laanwj @ryanofsky @jonasschnelli
@MarcoFalke
Member

MarcoFalke commented Nov 23, 2016

No description provided.

MarcoFalke and others added some commits Jul 8, 2016

@MarcoFalke MarcoFalke [rpcwallet] Don't use floating point 
Github-Pull: #8317
Rebased-From: 477777f
 ad99a79
@ryanofsky @MarcoFalke ryanofsky Send tip change notification from invalidateblock 
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 #8680 (comment)

Github-Pull: #9196
Rebased-From: 67c6326
cca151b

MarcoFalke added the Backport label Nov 23, 2016

MarcoFalke added this to the 0.12.2 milestone Nov 23, 2016

@TheBlueMatt
Contributor

TheBlueMatt commented Nov 23, 2016

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

MarcoFalke changed the title from [0.12.2] Backports to [0.12 branch] Backports Nov 24, 2016

@MarcoFalke
Member

MarcoFalke 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 @MarcoFalke laanwj torcontrol: Explicitly request RSA1024 private key 
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 #9214.

Github-Pull: #9234
Rebased-From: 7d3b627
82e29e8

MarcoFalke referenced this pull request Nov 30, 2016

Merged

torcontrol: Explicitly request RSA1024 private key #9234

@laanwj laanwj merged commit d609895 into bitcoin:0.12 Dec 14, 2016
1 check passed

1 check passed

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

@laanwj laanwj added a commit that referenced this pull request Dec 14, 2016

@laanwj laanwj Merge #9211: [0.12 branch] Backports 
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)
This commit was signed with a verified signature.
@laanwj laanwj Wladimir J. van der Laan
GPG key ID: 74810B012346C9A6 Learn about signing commits
c1b7421

MarcoFalke deleted the MarcoFalke:Mf1611-back12 branch Dec 14, 2016

MarcoFalke referenced this pull request Dec 14, 2016

Merged

[Wallet] Bugfix: Fundrawtransaction: don't terminate when keypool is empty #9295

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment