Skip to content

Conversation

@ryanofsky
Copy link
Contributor

@MarcoFalke suggested separating this commit from #9139. It's needed to prevent breaking a test that would otherwise fail with #9139.

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 <[email protected]>
in bitcoin#8680 (comment)
@morcos
Copy link
Contributor

morcos commented Nov 21, 2016

ACK

@maflcko
Copy link
Member

maflcko commented Nov 21, 2016

Concept ACK.

Can confirm, that this fixes the "Current number of blocks" display in the debug window, when invalidateblock is used.

Also, can confirm that this fixes the test failure in mempool_reorg after #9139.

@maflcko maflcko added this to the 0.13.2 milestone Nov 21, 2016
@maflcko
Copy link
Member

maflcko commented Nov 21, 2016

Tagged for backport to .13

(Backport to .12 also required)

@maflcko maflcko modified the milestones: 0.12.2, 0.13.2 Nov 21, 2016
@sipa
Copy link
Member

sipa commented Nov 22, 2016

utACK

1 similar comment
@sdaftuar
Copy link
Member

utACK

@jonasschnelli
Copy link
Contributor

utACK 67c6326

@laanwj laanwj merged commit 67c6326 into bitcoin:master Nov 23, 2016
laanwj added a commit that referenced this pull request Nov 23, 2016
67c6326 Send tip change notification from invalidateblock (Russell Yanofsky)

InvalidChainFound(pindex);
mempool.removeForReorg(pcoinsTip, chainActive.Tip()->nHeight + 1, STANDARD_LOCKTIME_VERIFY_FLAGS);
uiInterface.NotifyBlockTip(IsInitialBlockDownload(), pindex->pprev);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if the new best isn't pindex->pprev?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At this point, pindex->pprev == chainActive.Tip().
If there are valid blocks on top of the new tip with more ChainWork, it will be detected during the ActivateBestChain(state, Params(), NULL); in UniValue invalidateblock(const JSONRPCRequest& request).
The signal then gets fired twice (seems to be okay).

maflcko pushed a commit that referenced this pull request Nov 23, 2016
…9196)

1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)
maflcko pushed a commit to maflcko/bitcoin-core that referenced this pull request Nov 23, 2016
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 <[email protected]>
in bitcoin#8680 (comment)

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
@maflcko maflcko modified the milestones: 0.12.2, 0.13.2 Nov 23, 2016
luke-jr pushed a commit to luke-jr/bitcoin that referenced this pull request Dec 2, 2016
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 <[email protected]>
in bitcoin#8680 (comment)

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Mar 22, 2017
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 <[email protected]>
in bitcoin#8680 (comment)

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
UdjinM6 added a commit to dashpay/dash that referenced this pull request Apr 11, 2017
* Implement BIP 9 GBT changes

- BIP9DeploymentInfo struct for static deployment info
- VersionBitsDeploymentInfo: Avoid C++11ism by commenting parameter names
- getblocktemplate: Make sure to set deployments in the version if it is LOCKED_IN
- In this commit, all rules are considered required for clients to support

* qa/rpc-tests: bip9-softforks: Add tests for getblocktemplate versionbits updates

* getblocktemplate: Explicitly handle the distinction between GBT-affecting softforks vs not

* getblocktemplate: Use version/force mutation to support pre-BIP9 clients

* Don't use floating point

Github-Pull: bitcoin#8317
Rebased-From: 477777f

* 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 <[email protected]>
in bitcoin#8680 (comment)

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

* 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 bitcoin#9214.

Github-Pull: bitcoin#9234
Rebased-From: 7d3b627

* Bugfix: FRT: don't terminate when keypool is empty

Github-Pull: bitcoin#9295
Rebased-From: c24a4f5

* add fundrawtransaction test on a locked wallet with empty keypool

Github-Pull: bitcoin#9295
Rebased-From: 1a6eacb
codablock pushed a commit to codablock/dash that referenced this pull request Jan 17, 2018
…top of bitcoin#9196)

1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)
thokon00 pushed a commit to faircoin/faircoin that referenced this pull request Apr 17, 2018
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 <[email protected]>
in bitcoin#8680 (comment)

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
…top of bitcoin#9196)

1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 25, 2019
…top of bitcoin#9196)

1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)
@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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants