Skip to content

Conversation

@JeremyRand
Copy link
Member

Namecoin port of spesmilo#5147

Do not merge this until the upstream PR is merged and this PR is rebased accordingly.

JeremyRand and others added 13 commits November 5, 2019 09:08
This is a rough port of abf12b6 by
rt121212121 from Electron-Cash.

Cherry-picked from 19c2962

Conflicts:
	electrum/blockchain.py
	electrum/checkpoints.json
	electrum/checkpoints_testnet.json
	electrum/interface.py

Conflicts:
	electrum_nmc/electrum/blockchain.py
	electrum_nmc/electrum/constants.py
Cherry-picked from 2805cde

Conflicts:
	electrum_nmc/electrum/blockchain.py
	electrum_nmc/electrum/constants.py
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 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 JeremyRand force-pushed the namecoin-cp-height-checkpoints branch from 0b3332a to b18a73c Compare November 5, 2019 09:12
JeremyRand and others added 2 commits November 7, 2019 23:02
TODO: Needs rebase once cp_height merged upstream.
TODO: Needs rebase once cp_height merged upstream.

Cherry-picked from 342728a
@JeremyRand JeremyRand force-pushed the namecoin-cp-height-checkpoints branch from b18a73c to e98e315 Compare November 7, 2019 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant