Skip to content
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

Consolidate Bitcoin Core and Title Network into one function and refl… #85

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ The following coins are recognized, although may not be fully tested:
* BPA - [Bitcoin Pizza](http://p.top/en/index.html)
* BTC - [Bitcoin](https://bitcoin.org/en/)
* BTC2 - [Bitcoin 2](https://www.bitc2.org/)
* BTCC - [Bitcoin Core](https://bitcoincore.cm/)
* BTCH - [Bitcoin Hush](http://btchush.org/)
* BTCP - [Bitcoin Private](https://btcprivate.org/)
* BTF - [Bitcoin Faith](http://bitcoinfaith.org/)
Expand All @@ -44,7 +43,7 @@ The following coins are recognized, although may not be fully tested:
* MBC - [MicroBitcoin](https://microbitcoin.org/)
* NBTC - [NewBitcoin](http://www.newbitcoin.org/index_en.html)
* SBTC - [Super Bitcoin](http://superbtc.org/)
* TNET - [Title Network](https://title.network/)
* TNET - [Bitcoin Clashic](https://bitcoin.clashic.cash/) - FKA Bitcoin Clashic BCL/BCHC, Bitcoin Core BTCC, Title Network TNET
* UBTC - [United Bitcoin](https://www.ub.com/)
* WBTC - [World Bitcoin](http://www.wbtcteam.org/)

Expand Down
26 changes: 5 additions & 21 deletions claimer.py
Original file line number Diff line number Diff line change
Expand Up @@ -1222,20 +1222,6 @@ def __init__(self):
self.signid = self.signtype
self.BCLsalt = "c003700e0c31442382638363c1c7c19fc59f6f9fffcc7e4ebe67fc37781de007".decode("hex")

# https://github.com/bitcoin-cored/bitcoin-cored
class BitcoinCore(BitcoinFork):
def __init__(self):
BitcoinFork.__init__(self)
self.ticker = "BTCC"
self.fullname = "Bitcoin Core"
self.hardforkheight = 576698
self.magic = 0xe8f3e1e3
self.port = 10333
self.seeds = ("seeder.clashic.cash", "seeder.bitcoincore.zone", "seeder-mainnet.clashic.org")
self.signtype = 0x01 | 0x20
self.signid = self.signtype
self.bch_fork = True

# https://github.com/bitcoinfile/bitcoinfile/tree/master/bificore
class BitcoinFile(BitcoinFork):
def __init__(self):
Expand Down Expand Up @@ -1290,16 +1276,16 @@ def __init__(self):
self.SCRIPT_ADDRESS = chr(51)
self.txversion = 2

# https://github.com/title-network/title-network
class TitleNetwork(BitcoinFork):
# https://github.com/Bitcoin-Clashic/wallet-official
class BitcoinClashic(BitcoinFork):
def __init__(self):
BitcoinFork.__init__(self)
self.ticker = "TNET"
self.fullname = "Title Network"
self.fullname = "Bitcoin Clashic"
self.hardforkheight = 478559
self.magic = 0xf0dcb212
self.port = 10333
self.seeds = ("seeder.clashic.cash", "seeder.bitcoincore.zone", "seeder-mainnet.clashic.org", "tnetseed.bitcoin-rebooted.xyz")
self.seeds = ("seeder.clashic.cash", "seeder.bitcoincore.zone", "seeder-mainnet.clashic.org", "seeder.clashic.services")
self.signtype = 0x01 | 0x20
self.signid = self.signtype
self.bch_fork = True
Expand Down Expand Up @@ -1391,8 +1377,6 @@ def __init__(self):
coin = Bitcoin()
elif args.cointicker == "BTC2":
coin = Bitcoin2()
elif args.cointicker == "BTCC":
coin = BitcoinCore()
elif args.cointicker == "BTCH":
coin = BitcoinHush()
elif args.cointicker == "BTCP":
Expand Down Expand Up @@ -1432,7 +1416,7 @@ def __init__(self):
elif args.cointicker == "SBTC":
coin = SuperBitcoin()
elif args.cointicker == "TNET":
coin = TitleNetwork()
coin = BitcoinClashic()
elif args.cointicker == "UBTC":
coin = UnitedBitcoin()
elif args.cointicker == "WBTC":
Expand Down