Finish Proof class #4794

pull jtimon wants to merge 13 commits into bitcoin:master from jtimon:proof3 changing 15 files +314 −225
  1. jtimon commented at 12:24 pm on August 30, 2014: contributor
    Continues #4793 (completing the set of PRs #3839 #4422 #4446 #4457 #4457 #4603 #4377 #4506 #4793).
  2. petertodd commented at 9:55 pm on August 31, 2014: contributor
    Can we s/Proof/CProof/ to keep naming consistent?
  3. jtimon commented at 11:32 pm on August 31, 2014: contributor
    Renamed Proof -> CProof
  4. petertodd commented at 11:37 pm on August 31, 2014: contributor
    Thanks!
  5. jtimon force-pushed on Sep 1, 2014
  6. jtimon force-pushed on Sep 1, 2014
  7. jtimon commented at 7:22 pm on September 1, 2014: contributor

    Bringing description from #4793 here:

    Following @laanwj ’s advice of only moving ScanHash, I found another solution to encapsulate the miner’s pow without removing the miner’s optimization, which was rejected in #4423 But I would like to slightly change the behavior. Commit “Replace proof.nNonce >= 0xffff000 with an iteration counter” should be either rejected or squashed into “proof.nNonce >= 0xffff0000 -> proof.OutOfRangeSolution()” (and of course that 1000 in the for is open for bike-shedding). “Small miner optimization” also should be rejected or rebased in “Remove testnet’s special case from miner.cpp”. I think these 2 functional changes are meaningless enough that can be safely accepted. I would also be happy to just remove the hashmeter and the resulting PR would be simpler.

  8. CheckProof method for CBlockHeader and CBlockIndex f7b2823a5a
  9. jtimon force-pushed on Sep 2, 2014
  10. Create Proof class 8a0f3fef17
  11. jtimon force-pushed on Sep 2, 2014
  12. hide Proof::GetNextChallenge() cefae6fc0a
  13. CheckMinWork(uint, uint, int64) -> Proof::CheckMinChallenge(Proof&) 685a91857d
  14. Remove nNonce variable and parameter 7e2ed7bd58
  15. Remove testnet's special case from miner.cpp effa528fab
  16. jtimon force-pushed on Sep 2, 2014
  17. Small miner optimization d3d150350f
  18. Remove hash parameter from ScanHash 90383dfb03
  19. Move hashmeter inside ScanHash c595fd5d64
  20. Replace proof.nNonce >= 0xffff000 with an iteration counter 4d2c749c2d
  21. miner.cpp::ScanHash() -> Proof::GenerateSolution() a1c3e450fc
  22. nNonce = 0 -> ResetSolution() 597de362c5
  23. Make Proof attributes private d93c180cdf
  24. jtimon force-pushed on Sep 2, 2014
  25. BitcoinPullTester commented at 11:24 am on September 2, 2014: none
    Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4794_d93c180cdf32141f857c1d61c2e85cae8406ec6f/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
  26. jtimon commented at 11:29 am on September 2, 2014: contributor
    Closing until #4506 and #4793 are merged
  27. jtimon closed this on Sep 2, 2014

  28. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 15:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me