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

Send tip change notification from invalidateblock #9196

Merged
merged 1 commit into from Nov 23, 2016

Conversation

@ryanofsky
Copy link
Contributor

commented Nov 21, 2016

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

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)
@morcos

This comment has been minimized.

Copy link
Member

commented Nov 21, 2016

ACK

@MarcoFalke

This comment has been minimized.

Copy link
Member

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.

@MarcoFalke MarcoFalke added this to the 0.13.2 milestone Nov 21, 2016

@MarcoFalke

This comment has been minimized.

Copy link
Member

commented Nov 21, 2016

Tagged for backport to .13

(Backport to .12 also required)

@MarcoFalke MarcoFalke modified the milestones: 0.12.2, 0.13.2 Nov 21, 2016

@sipa

This comment has been minimized.

Copy link
Member

commented Nov 22, 2016

utACK

1 similar comment
@sdaftuar

This comment has been minimized.

Copy link
Member

commented Nov 23, 2016

utACK

@jonasschnelli

This comment has been minimized.

Copy link
Member

commented Nov 23, 2016

utACK 67c6326

@laanwj laanwj merged commit 67c6326 into bitcoin:master Nov 23, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
laanwj added a commit that referenced this pull request Nov 23, 2016
Merge #9196: Send tip change notification from invalidateblock
67c6326 Send tip change notification from invalidateblock (Russell Yanofsky)
@@ -3201,6 +3201,7 @@ bool InvalidateBlock(CValidationState& state, const CChainParams& chainparams, C

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

This comment has been minimized.

Copy link
@luke-jr

luke-jr Nov 23, 2016

Member

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

This comment has been minimized.

Copy link
@jonasschnelli

jonasschnelli Nov 23, 2016

Member

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).

MarcoFalke added a commit that referenced this pull request Nov 23, 2016
Merge #9139: Change sync_blocks to pick smarter maxheight (on top of #…
…9196)

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

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

@MarcoFalke MarcoFalke modified the milestones: 0.12.2, 0.13.2 Nov 23, 2016

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Dec 2, 2016
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 bitcoin#8680 (comment)

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

@laanwj laanwj added the Validation label Dec 19, 2016

UdjinM6 added a commit to UdjinM6/dash that referenced this pull request Mar 22, 2017
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 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
Align with btc 0.12 (#1409)
* 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 <sdaftuar@chaincode.com>
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 added a commit to codablock/dash that referenced this pull request Jan 17, 2018
Merge bitcoin#9139: Change sync_blocks to pick smarter maxheight (on …
…top of bitcoin#9196)

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

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
santiky added a commit to Punto0/faircoin2 that referenced this pull request Apr 18, 2018
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 bitcoin#8680 (comment)

Github-Pull: bitcoin#9196
Rebased-From: 67c6326
andvgal added a commit to energicryptocurrency/energi that referenced this pull request Jan 6, 2019
Merge bitcoin#9139: Change sync_blocks to pick smarter maxheight (on …
…top of bitcoin#9196)

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

1126c85 [qa] Change sync_blocks to pick smarter maxheight (Russell Yanofsky)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.