From 5f808e1aa96f6b587b49999ce4cfacd34d97759c Mon Sep 17 00:00:00 2001 From: clashicly Date: Mon, 26 Apr 2021 17:45:19 -0400 Subject: [PATCH] Consolidate Bitcoin Core and Title Network into one function and reflect rebranding back to Bitcoin Clashic. Update seeders --- README.md | 3 +-- claimer.py | 26 +++++--------------------- 2 files changed, 6 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 832a018..70e0035 100644 --- a/README.md +++ b/README.md @@ -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/) @@ -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/) diff --git a/claimer.py b/claimer.py index 8739820..4038dbb 100644 --- a/claimer.py +++ b/claimer.py @@ -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): @@ -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 @@ -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": @@ -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":