Skip to content

Conversation

sipa
Copy link
Member

@sipa sipa commented Jan 4, 2017

Fixes #9448.

This moves the transaction estimation code out of the checkpoint code and data, as this information is not used for checkpoints (a consensus-relevant property). In the last commit, the estimated transaction count is updated for mainnet and testnet to blocks from a few days ago.

@sipa sipa changed the title Disentangle progress estimationc from heckpoints and update it Disentangle progress estimation from checkpoints and update it Jan 4, 2017
@maflcko maflcko added this to the 0.14.0 milestone Jan 4, 2017
1488,
300
// Data as of block 00000000c2872f8f8a8935c8e3c5862be9038c97d4de2cf37ed496991166928a (height 1063660)
1483546230
Copy link
Member

Choose a reason for hiding this comment

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

I think this might not compile due to missing ,?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

@maflcko
Copy link
Member

maflcko commented Jan 4, 2017

utACK fec404013df40cfd767ae186723a94c23990c424 mod nit

@sipa sipa force-pushed the update_tx_estimation branch from fec4040 to f9a0275 Compare January 4, 2017 16:41
@gmaxwell
Copy link
Contributor

gmaxwell commented Jan 4, 2017

Concept ACK.

@sipa
Copy link
Member Author

sipa commented Jan 4, 2017

Just realized that this code is wrong: it assumes the SIGCHECK_VERIFICATION_FACTOR applies after the timestamp and not before (as opposed to after the last checkpoint).

@sipa
Copy link
Member Author

sipa commented Jan 4, 2017

Suggestion: get rid of the SIGCHECK_VERIFICATION_FACTOR entirely (as it now applies to over 80% of the chain's transactions).

@gmaxwell
Copy link
Contributor

gmaxwell commented Jan 4, 2017

I agree with getting rid of it.

@sipa sipa force-pushed the update_tx_estimation branch from f9a0275 to 2ac28a1 Compare January 4, 2017 21:20
@sipa
Copy link
Member Author

sipa commented Jan 4, 2017

Updated to remove SIGCHECK_VERIFICATION_FACTOR

@laanwj
Copy link
Member

laanwj commented Jan 5, 2017

Concept ACK

@cdecker
Copy link
Contributor

cdecker commented Jan 5, 2017

ACK 2ac28a1749ccc1e733c24b762b77ab099df48a3b


int64_t nNow = time(NULL);

double fTxTotal;
Copy link
Contributor

Choose a reason for hiding this comment

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

Dont we use "d" for floats to disambiguate flags?

Copy link
Member Author

Choose a reason for hiding this comment

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

Indeed. Fixed!

Copy link
Member

Choose a reason for hiding this comment

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

Post merge µNit: Seems this was not fixed.

Copy link
Member

Choose a reason for hiding this comment

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

Bah, why are we using hungarian notation of variables in new code at all?

@sipa sipa force-pushed the update_tx_estimation branch from 2ac28a1 to df36371 Compare January 11, 2017 16:27
@jtimon
Copy link
Contributor

jtimon commented Jan 11, 2017

Concept ACK.
I'm going to only utACK individual commits for now: a4bac66 3641141

@gmaxwell
Copy link
Contributor

ACK.

@laanwj laanwj merged commit df36371 into bitcoin:master Jan 12, 2017
laanwj added a commit that referenced this pull request Jan 12, 2017
…ate it

df36371 Update estimated transaction count data (Pieter Wuille)
e356d9a Shorten variable names and switch to tx/s (Pieter Wuille)
6dd8116 Remove SIGCHECK_VERIFICATION_FACTOR (Pieter Wuille)
3641141 Move tx estimation data out of CCheckPointData (Pieter Wuille)
a4bac66 [MOVEONLY] Move progress estimation out of checkpoints (Pieter Wuille)

int64_t nNow = time(NULL);

double fTxTotal;
Copy link
Member Author

Choose a reason for hiding this comment

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

Because there is a persistent "imitate the surrounding code" suggestion. If we actually want to migrate away from using that style, I'm all for it, but it means we should start enforcing a new style in reviews.

codablock pushed a commit to codablock/dash that referenced this pull request Jan 21, 2018
…and update it

df36371 Update estimated transaction count data (Pieter Wuille)
e356d9a Shorten variable names and switch to tx/s (Pieter Wuille)
6dd8116 Remove SIGCHECK_VERIFICATION_FACTOR (Pieter Wuille)
3641141 Move tx estimation data out of CCheckPointData (Pieter Wuille)
a4bac66 [MOVEONLY] Move progress estimation out of checkpoints (Pieter Wuille)
andvgal pushed a commit to energicryptocurrency/gen2-energi that referenced this pull request Jan 6, 2019
…and update it

df36371 Update estimated transaction count data (Pieter Wuille)
e356d9a Shorten variable names and switch to tx/s (Pieter Wuille)
6dd8116 Remove SIGCHECK_VERIFICATION_FACTOR (Pieter Wuille)
3641141 Move tx estimation data out of CCheckPointData (Pieter Wuille)
a4bac66 [MOVEONLY] Move progress estimation out of checkpoints (Pieter Wuille)
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
CryptoCentric pushed a commit to absolute-community/absolute that referenced this pull request Feb 27, 2019
…dablock committed on Jan 20, 2018 Use version 2 blocks for miner_tests … @codablock codablock committed on Jan 20, 2018   Merge bitcoin#7871: Manual block file pruning.  …  @laanwj @codablock laanwj authored and codablock committed on Jan 11, 2017   Merge bitcoin#9507: Fix use-after-free in CTxMemPool::removeConflicts()  …  @sipa @codablock sipa authored and codablock committed on Jan 11, 2017   Merge bitcoin#9297: Various RPC help outputs updated  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9416: travis: make distdir before make  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9520: Deprecate non-txindex getrawtransaction and bette…  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9518: Return height of last block pruned by pruneblockc…  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 12, 2017   Merge bitcoin#9472: Disentangle progress estimation from checkpoints …  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#8883: Add all standard TXO types to bitcoin-tx  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9261: Add unstored orphans with rejected parents to rec…  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9468: [Depends] Dependency updates for 0.14.0  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9222: Add 'subtractFeeFromAmount' option to 'fundrawtra…  …  @laanwj @codablock laanwj authored and codablock committed on Jan 12, 2017   Merge bitcoin#9490: Replace FindLatestBefore used by importmuti with …  …  @sipa @codablock sipa authored and codablock committed on Jan 13, 2017   Merge bitcoin#9469: [depends] Qt 5.7.1  …  @laanwj @codablock laanwj authored and codablock committed on Jan 15, 2017   Merge bitcoin#9380: Separate different uses of minimum fees  …  @laanwj @codablock laanwj authored and codablock committed on Jan 16, 2017   Remove SegWit related code in dash-tx  @codablock codablock committed on Sep 21, 2017   Merge bitcoin#9561: Wake message handling thread when we receive a ne…  …  @sipa @codablock sipa authored and codablock committed on Jan 17, 2017   Merge bitcoin#9508: Remove unused Python imports  …  @MarcoFalke @codablock MarcoFalke authored and codablock committed on Jan 18, 2017   Merge bitcoin#9512: Fix various things -fsanitize complains about
@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.

Update estimated transaction count
9 participants