diff --git a/README b/README index e58176c..7018134 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ -bitcoin-seeder +seeder ============== -Bitcoin-seeder is a crawler for the Bitcoin network, which exposes a list +seeder is a crawler for the LBRY network, which exposes a list of reliable nodes via a built-in DNS server. Features: @@ -17,7 +17,7 @@ Features: REQUIREMENTS ------------ -$ sudo apt-get install build-essential libboost-all-dev libssl-dev +$ sudo apt-get install build-essential libboost-dev libssl-dev USAGE ----- diff --git a/bitcoin.cpp b/bitcoin.cpp index 021d7e1..c9ca4cc 100644 --- a/bitcoin.cpp +++ b/bitcoin.cpp @@ -36,16 +36,16 @@ class CNode { nHeaderStart = vSend.size(); vSend << CMessageHeader(pszCommand, 0); nMessageStart = vSend.size(); -// printf("%s: SEND %s\n", ToString(you).c_str(), pszCommand); +// printf("%s: SEND %s\n", ToString(you).c_str(), pszCommand); } - + void AbortMessage() { if (nHeaderStart == -1) return; vSend.resize(nHeaderStart); nHeaderStart = -1; nMessageStart = -1; } - + void EndMessage() { if (nHeaderStart == -1) return; unsigned int nSize = vSend.size() - nMessageStart; @@ -60,7 +60,7 @@ class CNode { nHeaderStart = -1; nMessageStart = -1; } - + void Send() { if (sock == INVALID_SOCKET) return; if (vSend.empty()) return; @@ -72,7 +72,7 @@ class CNode { sock = INVALID_SOCKET; } } - + void PushVersion() { int64 nTime = time(NULL); uint64 nLocalNonce = BITCOIN_SEED_NONCE; @@ -80,12 +80,12 @@ class CNode { CAddress me(CService("0.0.0.0")); BeginMessage("version"); int nBestHeight = GetRequireHeight(); - string ver = "/bitcoin-seeder:0.01/"; + string ver = "/lbry-seeder:0.01/"; uint8_t fRelayTxs = 0; vSend << PROTOCOL_VERSION << nLocalServices << nTime << you << me << nLocalNonce << ver << nBestHeight << fRelayTxs; EndMessage(); } - + void GotVersion() { // printf("\n%s: version %i\n", ToString(you).c_str(), nVersion); if (vAddr) { @@ -112,7 +112,7 @@ class CNode { vRecv >> strSubVer; if (nVersion >= 209 && !vRecv.empty()) vRecv >> nStartingHeight; - + if (nVersion >= 209) { BeginMessage("verack"); EndMessage(); @@ -124,13 +124,13 @@ class CNode { } return false; } - + if (strCommand == "verack") { this->vRecv.SetVersion(min(nVersion, PROTOCOL_VERSION)); GotVersion(); return false; } - + if (strCommand == "addr" && vAddr) { vector vAddrNew; vRecv >> vAddrNew; @@ -153,10 +153,10 @@ class CNode { } return false; } - + return false; } - + bool ProcessMessages() { if (vRecv.empty()) return false; do { @@ -172,16 +172,16 @@ class CNode { vector vHeaderSave(vRecv.begin(), vRecv.begin() + nHeaderSize); CMessageHeader hdr; vRecv >> hdr; - if (!hdr.IsValid()) { + if (!hdr.IsValid()) { // printf("%s: BAD (invalid header)\n", ToString(you).c_str()); ban = 100000; return true; } string strCommand = hdr.GetCommand(); unsigned int nMessageSize = hdr.nMessageSize; - if (nMessageSize > MAX_SIZE) { + if (nMessageSize > MAX_SIZE) { // printf("%s: BAD (message too large)\n", ToString(you).c_str()); ban = 100000; - return true; + return true; } if (nMessageSize > vRecv.size()) { vRecv.insert(vRecv.begin(), vHeaderSave.begin(), vHeaderSave.end()); @@ -201,7 +201,7 @@ class CNode { } while(1); return false; } - + public: CNode(const CService& ip, vector* vAddrIn) : you(ip), nHeaderStart(-1), nMessageStart(-1), vAddr(vAddrIn), ban(0), doneAfter(0), nVersion(0) { vSend.SetType(SER_NETWORK); @@ -261,19 +261,19 @@ public: sock = INVALID_SOCKET; return (ban == 0) && res; } - + int GetBan() { return ban; } - + int GetClientVersion() { return nVersion; } - + std::string GetClientSubVersion() { return strSubVer; } - + int GetStartingHeight() { return nStartingHeight; } @@ -314,4 +314,3 @@ int main(void) { printf("ret=%s ban=%i vAddr.size()=%i\n", ret ? "good" : "bad", ban, (int)vAddr.size()); } */ - diff --git a/combine.pl b/combine.pl index 6493724..8a9c1fc 100644 --- a/combine.pl +++ b/combine.pl @@ -58,7 +58,7 @@ for my $file (@ARGV) { } for my $addr (sort { $res->{$b} <=> $res->{$a} } (keys %{$res})) { - if ($addr =~ /\A(\d+)\.(\d+)\.(\d+)\.(\d+):8333/) { + if ($addr =~ /\A(\d+)\.(\d+)\.(\d+)\.(\d+):9246/) { my $a = $1*0x1000000 + $2*0x10000 + $3*0x100 + $4; printf "0x%08x %s %g%%\n",$a,$addr,(1-((1-$res->{$addr}) ** (1/$n)))*100; } diff --git a/db.h b/db.h index 58caad1..ee6af75 100644 --- a/db.h +++ b/db.h @@ -12,11 +12,11 @@ #define MIN_RETRY 1000 -#define REQUIRE_VERSION 70001 +#define REQUIRE_VERSION 70015 static inline int GetRequireHeight(const bool testnet = fTestNet) { - return testnet ? 500000 : 350000; + return testnet ? 1000 : 940000; } std::string static inline ToString(const CService &ip) { @@ -119,7 +119,7 @@ public: } int GetBanTime() const { if (IsGood()) return 0; - if (clientVersion && clientVersion < 31900) { return 604800; } + if (clientVersion && clientVersion < 31800) { return 604800; } if (stat1M.reliability - stat1M.weight + 1.0 < 0.15 && stat1M.count > 32) { return 30*86400; } if (stat1W.reliability - stat1W.weight + 1.0 < 0.10 && stat1W.count > 16) { return 7*86400; } if (stat1D.reliability - stat1D.weight + 1.0 < 0.05 && stat1D.count > 8) { return 1*86400; } diff --git a/main.cpp b/main.cpp index 9ef5062..d2c0174 100644 --- a/main.cpp +++ b/main.cpp @@ -36,7 +36,7 @@ public: CDnsSeedOpts() : nThreads(96), nDnsThreads(4), ip_addr("::"), nPort(53), mbox(NULL), ns(NULL), host(NULL), tor(NULL), fUseTestNet(false), fWipeBan(false), fWipeIgnore(false), ipv4_proxy(NULL), ipv6_proxy(NULL) {} void ParseCommandLine(int argc, char **argv) { - static const char *help = "Bitcoin-seeder\n" + static const char *help = "LBRY-seeder\n" "Usage: %s -h -n [-m ] [-t ] [-p ]\n" "\n" "Options:\n" @@ -78,24 +78,24 @@ public: {0, 0, 0, 0} }; int option_index = 0; - int c = getopt_long(argc, argv, "h:n:m:t:a:p:d:o:i:k:w:", long_options, &option_index); + int c = getopt_long(argc, argv, "h:n:m:t:a:p:d:o:i:k:w:?", long_options, &option_index); if (c == -1) break; switch (c) { case 'h': { host = optarg; break; } - + case 'm': { mbox = optarg; break; } - + case 'n': { ns = optarg; break; } - + case 't': { int n = strtol(optarg, NULL, 10); if (n > 0 && n < 1000) nThreads = n; @@ -418,11 +418,9 @@ extern "C" void* ThreadStats(void*) { return nullptr; } -static const string mainnet_seeds[] = {"dnsseed.bluematt.me", "bitseed.xf2.org", "dnsseed.bitcoin.dashjr.org", "seed.bitcoin.sipa.be", ""}; -static const string testnet_seeds[] = {"testnet-seed.alexykot.me", - "testnet-seed.bitcoin.petertodd.org", - "testnet-seed.bluematt.me", - "testnet-seed.bitcoin.schildbach.de", +static const string mainnet_seeds[] = {"dnsseed1.lbry.io", "dnsseed2.lbry.io", "dnsseed3.lbry.io", ""}; +static const string testnet_seeds[] = {"testdnsseed1.lbry.io", + "testdnsseed2.lbry.io", ""}; static const string *seeds = mainnet_seeds; @@ -480,10 +478,10 @@ int main(int argc, char **argv) { bool fDNS = true; if (opts.fUseTestNet) { printf("Using testnet.\n"); - pchMessageStart[0] = 0x0b; - pchMessageStart[1] = 0x11; - pchMessageStart[2] = 0x09; - pchMessageStart[3] = 0x07; + pchMessageStart[0] = 0xfa; + pchMessageStart[1] = 0xe4; + pchMessageStart[2] = 0xaa; + pchMessageStart[3] = 0xe1; seeds = testnet_seeds; fTestNet = true; } diff --git a/protocol.cpp b/protocol.cpp index 2637aa4..08d1e20 100644 --- a/protocol.cpp +++ b/protocol.cpp @@ -22,7 +22,7 @@ static const char* ppszTypeName[] = "block", }; -unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 }; +unsigned char pchMessageStart[4] = { 0xfa, 0xe4, 0xaa, 0xf1 }; CMessageHeader::CMessageHeader() { diff --git a/protocol.h b/protocol.h index bd19c78..ae5215a 100644 --- a/protocol.h +++ b/protocol.h @@ -18,7 +18,7 @@ extern bool fTestNet; static inline unsigned short GetDefaultPort(const bool testnet = fTestNet) { - return testnet ? 18333 : 8333; + return testnet ? 19246 : 9246; } // @@ -44,7 +44,7 @@ class CMessageHeader READWRITE(FLATDATA(pchMessageStart)); READWRITE(FLATDATA(pchCommand)); READWRITE(nMessageSize); - if (nVersion >= 209) + if (nVersion >= 1) READWRITE(nChecksum); ) diff --git a/serialize.h b/serialize.h index 4e677c3..250a253 100644 --- a/serialize.h +++ b/serialize.h @@ -60,7 +60,7 @@ class CDataStream; class CAutoFile; static const unsigned int MAX_SIZE = 0x02000000; -static const int PROTOCOL_VERSION = 60000; +static const int PROTOCOL_VERSION = 70015; // Used to bypass the rule against non-const reference to temporary // where it makes sense with wrappers such as CFlatData or CTxDB