forked from spesmilo/electrum
-
Notifications
You must be signed in to change notification settings - Fork 24
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
(WIP) Use cp_height for checkpoints #173
Open
JeremyRand
wants to merge
15
commits into
namecoin:master
Choose a base branch
from
JeremyRand:namecoin-cp-height-checkpoints
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
(WIP) Use cp_height for checkpoints #173
JeremyRand
wants to merge
15
commits into
namecoin:master
from
JeremyRand:namecoin-cp-height-checkpoints
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
JeremyRand
force-pushed
the
namecoin-cp-height-checkpoints
branch
from
November 5, 2019 06:24
cb3cccf
to
0b3332a
Compare
Cherry-picked from 2d88b8b.
Cherry-picked from 2805cde Conflicts: electrum_nmc/electrum/blockchain.py electrum_nmc/electrum/constants.py
Cherry-picked from 64d9f08
Cherry-picked from fdc9e2f
Cherry-picked from 9d46205 Conflicts: electrum_nmc/electrum/constants.py
This makes it easier for Electrum forks to support alternate header formats such as AuxPoW. Cherry-picked from baff006. Conflicts: electrum/blockchain.py
Cherry-picked from 67d3abc
Cherry-picked from 20df0fa Conflicts: electrum_nmc/electrum/constants.py
Cherry-picked from 73bc591 Move hash_merkle_root to blockchain.py to avoid circular imports.
TODO: Needs rebase once cp_height merged upstream.
TODO: Needs rebase once cp_height merged upstream.
JeremyRand
force-pushed
the
namecoin-cp-height-checkpoints
branch
from
November 5, 2019 09:12
0b3332a
to
b18a73c
Compare
TODO: Needs rebase once cp_height merged upstream.
TODO: Needs rebase once cp_height merged upstream. Cherry-picked from 342728a
JeremyRand
force-pushed
the
namecoin-cp-height-checkpoints
branch
from
November 7, 2019 23:03
b18a73c
to
e98e315
Compare
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.
Namecoin port of spesmilo#5147
Do not merge this until the upstream PR is merged and this PR is rebased accordingly.