Update work calculation, and immediate hard fork to subvert attack #5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
protonn
pushed a commit
that referenced
this pull request
Nov 2, 2017
c521b3a Merge #11: fixup define checks. Cleans up some oopses from #5. 8b1cd37 fixup define checks. Cleans up some oopses from #5. 6b1508d Merge #6: Fixes typo fceb805 Merge #10: Clean up compile-time warnings (gcc 7.1) 0ec2a34 Clean up compile-time warnings (gcc 7.1) d4c268a Merge #5: Move helper functions out of sse4.2 object 8d4eb08 Add HasAcceleratedCRC32C to port_win.h 77cfbfd25 crc32: move helper functions out of port_posix_sse.cc 4c1e9e0 silence compiler warnings about uninitialized variables 4953164 Merge #2: Prefer std::atomic over MemoryBarrier 2953978 Fixes typo f134284 Merge #1: Merge upstream LevelDB 1.20 ba8a445 Prefer std::atomic over MemoryBarrier git-subtree-dir: src/leveldb git-subtree-split: c521b3a
protonn
pushed a commit
that referenced
this pull request
Jan 11, 2018
Summary: Includes: bitcoin-core/leveldb-subtree#2: Prefer std::atomic over MemoryBarrier (Pieter Wuille) bitcoin-core/leveldb-subtree#5: Move helper functions out of sse4.2 object (Cory Fields) bitcoin-core/leveldb-subtree#6: Fixes typo (Dimitris Tsapakidis) bitcoin-core/leveldb-subtree#10: Clean up compile-time warnings (gcc 7.1) (Matt Corallo) bitcoin-core/leveldb-subtree#11: fixup define checks. Cleans up some oopses from #5 (Cory Fields) Removes many warnings on MacOSX of the form: In file included from leveldb/util/cache.cc:10: In file included from ./leveldb/port/port.h:14: In file included from ./leveldb/port/port_posix.h:47: ./leveldb/port/atomic_pointer.h:55:3: warning: 'OSMemoryBarrier' is deprecated: first deprecated in macOS 10.12 - Use std::atomic_thread_fence() from <atomic> instead [-Wdeprecated-declarations] OSMemoryBarrier(); ^ The bitcoin core patches have been included in BU already by sickpig. Test Plan: make check. Installed and running fine. Reviewers: #bitcoin_abc, deadalnix Reviewed By: #bitcoin_abc, deadalnix Differential Revision: https://reviews.bitcoinabc.org/D584
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
-Implement new work calculation algorithm based on MentalCollatz's work
digibyte/digibyte#36
-Update fork height for Coinbase Maturity
Due to the nature of the attack on the network, the best solution is an immediate hard fork. The changes listed above are effective immediately. I have forked from a good block (2,387,837 before the attack) and mined a total of 3 blocks past the fork height (2,387,838) to ensure a smooth transition.
Start your wallet with the -reindex command.
-Added checkpoint post fork.
-Minimum protocol version is 1070000
-Fixed relayfee calculation