Skip to content

Merge upstream#6

Open
ch4ot1c wants to merge 80 commits intoBTCPrivate-Legacy:masterfrom
ch4ot1c:master
Open

Merge upstream#6
ch4ot1c wants to merge 80 commits intoBTCPrivate-Legacy:masterfrom
ch4ot1c:master

Conversation

@ch4ot1c
Copy link
Copy Markdown
Collaborator

@ch4ot1c ch4ot1c commented Mar 18, 2018

Latest electrumx. Additionally, Dockerfile btcpified.

AmiT177 and others added 30 commits January 19, 2018 04:49
* Added HOdlcoin support.

* Update coins.py

* HOdlcoin block test
- add method mempool.get_fee_histogram
- bump protocol version to 1.2
* add Koto

* Add testfile
- Update docs.  Height is 0 for mempool receipts
- Implement mempool.get_utxos() and use it
- Rename mempool.spends to mempool.potential_spends

Closes kyuupichan#365
Since tests on nightly are quite likely to fail anyway, it doesn't make too much sense  to test there.
They were really for fs_block_hashes; that still enforces
the full constraint.  Simplifies get_chunk.
* Added DNR

With tests
pooler and others added 30 commits March 8, 2018 18:41
* Fix testnet rpc port and removed invalid assert for Decred
vesrion -> version
Also only if peer discovery is enabled.  It's less confusing
that way.
bitbayd has adapted new method of creating raw blocks
* Implemented electrum_header for BTG to include solution (needed for validation on clientside)
Add RPC_PORT for BTG node

* Added node regtest compatibility

* Updated unittests

* Changed chunksize and regtest rpc port

* Changed bits transfer format to decimal

* Add testnet v3 params and corrected coin name
Update peers.py to not pass local_addr to proxy
* Add arihanc clearnet and tor to bitcoinsegwit

* Add arihanc tor to bitcoincash

* Add arihanc tor (V3) address to bitcoin segwit testnet

* Add arihanc clearnet and tor (v3) to bitcoincashtestnet
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.