/bitcoin

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() #8985

Merged
merged 2 commits into from Oct 21, 2016
+9 −12

Conversation

Reviewers

@dcousens dcousens

Assignees
No one assigned
Labels
GUI Priority Medium
Projects
None yet
Milestone
No milestone
3 participants
@jonasschnelli @sipa @dcousens
@jonasschnelli
Member

jonasschnelli commented Oct 20, 2016

Should fix #8984
Also displays the best header height in the modal overlay.

jonasschnelli added some commits Oct 20, 2016

@jonasschnelli
Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHea… 
…derTip()
This commit was signed with a verified signature.
@jonasschnelli jonasschnelli Jonas Schnelli
GPG key ID: 29D4BCB6416F53EC Learn about signing commits
0a261b6
@jonasschnelli
[Qt] use NotifyHeaderTip's height and date for the progress update
This commit was signed with a verified signature.
@jonasschnelli jonasschnelli Jonas Schnelli
GPG key ID: 29D4BCB6416F53EC Learn about signing commits
3154d6e

@jonasschnelli jonasschnelli added Priority Medium GUI labels Oct 20, 2016

@sipa
Owner

sipa commented Oct 20, 2016

Tested ACK 3154d6e

@jonasschnelli jonasschnelli merged commit 3154d6e into bitcoin:master Oct 21, 2016
1 check passed

1 check passed

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

jonasschnelli added a commit that referenced this pull request Oct 21, 2016

@jonasschnelli
Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates … 
…for NotifyHeaderTip()


3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
This commit was signed with a verified signature.
@jonasschnelli jonasschnelli Jonas Schnelli
GPG key ID: 29D4BCB6416F53EC Learn about signing commits
7b1bfa3

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Dec 21, 2016

@jonasschnelli @luke-jr
Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHea… 
…derTip()

Github-Pull: #8985
Rebased-From: 0a261b6
71491d0

luke-jr added a commit to bitcoinknots/bitcoin that referenced this pull request Dec 21, 2016

@jonasschnelli @luke-jr
[Qt] use NotifyHeaderTip's height and date for the progress update 
Github-Pull: #8985
Rebased-From: 3154d6e
6b474fa

codablock added a commit to codablock/dash that referenced this pull request Sep 9, 2017

@jonasschnelli @codablock
Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates … 
…for NotifyHeaderTip()


3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
9e87718

codablock added a commit to codablock/dash that referenced this pull request Sep 11, 2017

@jonasschnelli @codablock
Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates … 
…for NotifyHeaderTip()


3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)
509210a

UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 11, 2017

@codablock @UdjinM6
Backport Bitcoin Qt/Gui changes up to 0.14.x part 3 (#1617) 
* Merge #8996: Network activity toggle

19f46f1 Qt: New network_disabled icon (Luke Dashjr)
54cf997 RPC/Net: Use boolean consistently for networkactive, and remove from getinfo (Luke Dashjr)
b2b33d9 Overhaul network activity toggle (Jonas Schnelli)
32efa79 Qt: Add GUI feedback and control of network activity state. (Jon Lund Steffensen)
e38993b RPC: Add "togglenetwork" method to toggle network activity temporarily (Jon Lund Steffensen)
7c9a98a Allow network activity to be temporarily suspended. (Jon Lund Steffensen)

* Revert on-click behavior of network status icon to showing peers list

Stay with the way Dash handled clicking on the status icon

* Add theme support for network disabled icon

* Merge #8874: Multiple Selection for peer and ban tables

1077577 Fix auto-deselection of peers (Andrew Chow)
addfdeb Multiple Selection for peer and ban tables (Andrew Chow)

* Merge #9190: qt: Plug many memory leaks

ed998ea qt: Avoid OpenSSL certstore-related memory leak (Wladimir J. van der Laan)
5204598 qt: Avoid shutdownwindow-related memory leak (Wladimir J. van der Laan)
e4f126a qt: Avoid splash-screen related memory leak (Wladimir J. van der Laan)
693384e qt: Prevent thread/memory leak on exiting RPCConsole (Wladimir J. van der Laan)
47db075 qt: Plug many memory leaks (Wladimir J. van der Laan)

* Merge #9218: qt: Show progress overlay when clicking spinner icon

042f9fa qt: Show progress overlay when clicking spinner icon (Wladimir J. van der Laan)
827d9a3 qt: Replace NetworkToggleStatusBarControl with generic ClickableLabel (Wladimir J. van der Laan)

* Merge #9266: Bugfix: Qt/RPCConsole: Put column enum in the right places

df17fe0 Bugfix: Qt/RPCConsole: Put column enum in the right places (Luke Dashjr)

* Merge #9255: qt: layoutAboutToChange signal is called layoutAboutToBeChanged

f36349e qt: Remove on_toggleNetworkActiveButton_clicked from RPCConsole (Wladimir J. van der Laan)
297cc20 qt: layoutAboutToChange signal is called layoutAboutToBeChanged (Wladimir J. van der Laan)

* Use UniValue until bitcoin PR #8788 is backported

Network active toggle was already based on
"[RPC] Give RPC commands more information about the RPC request"
We need to use the old UniValue style until that one is backported

* Merge #8906: [qt] sync-overlay: Don't show progress twice

fafeec3 [qt] sync-overlay: Don't show progress twice (MarcoFalke)

* Merge #8985: Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip()

3154d6e [Qt] use NotifyHeaderTip's height and date for the progress update (Jonas Schnelli)
0a261b6 Use pindexBestHeader instead of setBlockIndexCandidates for NotifyHeaderTip() (Jonas Schnelli)

* Merge #9280: [Qt] Show ModalOverlay by pressing the progress bar, allow hiding

89a3723 [Qt] Show ModalOverlay by pressing the progress bar, disabled show() in sync mode (Jonas Schnelli)

* Merge #9461: [Qt] Improve progress display during headers-sync and peer-finding

40ec7c7 [Qt] Improve progress display during headers-sync and peer-finding (Jonas Schnelli)

* Merge #9588: qt: Use nPowTargetSpacing constant

fa4d478 qt: Use nPowTargetSpacing constant (MarcoFalke)

* Hide modal overlay forever when syncing has catched up

Don't allow to open it again by clicking on the progress bar and spinner
icon. Currently the overlay does not show meaningful information about
masternode sync and it gives the impression of being stuck after the block
chain sync is done.

* Don't include chainparams.h in sendcoinsdialog.cpp

This was just a remainder of a backported PR which meant to change some
calculation in this file which does not apply to Dash.

* Also check for fNetworkActive in ConnectNode

* Merge #9528: [qt] Rename formateNiceTimeOffset(qint64) to formatNiceTimeOffset(qint64)

988d300 [qt] Rename formateNiceTimeOffset(qint64) to formatNiceTimeOffset(qint64) (practicalswift)

* Merge #11237: qt: Fixing division by zero in time remaining

c8d38ab Refactor tipUpdate as per style guide (MeshCollider)
3b69a08 Fix division by zero in time remaining (MeshCollider)

Pull request description:

  Fixes bitcoin#10291, bitcoin#11265

  progressDelta may be 0 (or even negative according to 11265), this checks for that and prints unknown if it is, because we cannot calculate an estimate for the time remaining (would be infinite or negative).

Tree-SHA512: bc5708e5ed6e4670d008219558c5fbb25709bd99a32c98ec39bb74f94a0b7fa058f3d03389ccdd39e6723e6b5b48e34b13ceee7c051c2db631e51d8ec3e1d68c
91d99fc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment