From f9bb5e21d2873da2c95e133bbd6f6611503b1b7b Mon Sep 17 00:00:00 2001 From: fkolakovic Date: Mon, 29 Apr 2024 14:16:49 +0200 Subject: [PATCH 1/5] Change port number --- contrib/qos/tc.sh | 10 ++-- contrib/tracing/README.md | 38 +++++++------- doc/developer-notes.md | 2 +- doc/tor.md | 8 +-- doc/zmq.md | 6 +-- src/bench/addrman.cpp | 2 +- src/netbase.h | 2 +- src/rpc/net.cpp | 16 +++--- src/test/addrman_tests.cpp | 66 ++++++++++++------------- src/test/fuzz/addrman.cpp | 2 +- src/test/net_peer_connection_tests.cpp | 4 +- src/test/net_tests.cpp | 20 ++++---- src/test/netbase_tests.cpp | 20 ++++---- test/functional/feature_anchors.py | 2 +- test/functional/feature_asmap.py | 2 +- test/functional/feature_proxy.py | 8 +-- test/functional/p2p_addr_relay.py | 9 ++-- test/functional/p2p_addrv2_relay.py | 2 +- test/functional/p2p_dns_seeds.py | 8 +-- test/functional/p2p_getaddr_caching.py | 2 +- test/functional/p2p_i2p_ports.py | 2 +- test/functional/p2p_invalid_messages.py | 2 +- test/functional/rpc_net.py | 22 ++++----- 23 files changed, 128 insertions(+), 127 deletions(-) diff --git a/contrib/qos/tc.sh b/contrib/qos/tc.sh index 7c54183e7210b..f3c4cfea1d28a 100755 --- a/contrib/qos/tc.sh +++ b/contrib/qos/tc.sh @@ -47,16 +47,16 @@ fi # ret=$? #done -#limit outgoing traffic to and from port 8333. but not when dealing with a host on the local network +#limit outgoing traffic to and from port 6333. but not when dealing with a host on the local network # (defined by $LOCALNET_V4 and $LOCALNET_V6) # --set-mark marks packages matching these criteria with the number "2" (v4) # --set-mark marks packages matching these criteria with the number "4" (v6) # these packets are filtered by the tc filter with "handle 2" # this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT} -iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 -iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 6333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 +iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 6333 ! -d ${LOCALNET_V4} -j MARK --set-mark 0x2 if [ -n "${LOCALNET_V6}" ] ; then - ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 - ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 + ip6tables -t mangle -A OUTPUT -p tcp -m tcp --dport 6333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 + ip6tables -t mangle -A OUTPUT -p tcp -m tcp --sport 6333 ! -d ${LOCALNET_V6} -j MARK --set-mark 0x4 fi diff --git a/contrib/tracing/README.md b/contrib/tracing/README.md index 28581de5e91f8..906a3449d96da 100644 --- a/contrib/tracing/README.md +++ b/contrib/tracing/README.md @@ -62,13 +62,13 @@ $ bpftrace contrib/tracing/log_p2p_traffic.bt Output ``` -outbound 'ping' msg to peer 11 (outbound-full-relay, [2a02:b10c:f747:1:ef:fake:ipv6:addr]:8333) with 8 bytes -inbound 'pong' msg from peer 11 (outbound-full-relay, [2a02:b10c:f747:1:ef:fake:ipv6:addr]:8333) with 8 bytes -inbound 'inv' msg from peer 16 (outbound-full-relay, XX.XX.XXX.121:8333) with 37 bytes -outbound 'getdata' msg to peer 16 (outbound-full-relay, XX.XX.XXX.121:8333) with 37 bytes -inbound 'tx' msg from peer 16 (outbound-full-relay, XX.XX.XXX.121:8333) with 222 bytes -outbound 'inv' msg to peer 9 (outbound-full-relay, faketorv3addressa2ufa6odvoi3s77j4uegey0xb10csyfyve2t33curbyd.onion:8333) with 37 bytes -outbound 'inv' msg to peer 7 (outbound-full-relay, XX.XX.XXX.242:8333) with 37 bytes +outbound 'ping' msg to peer 11 (outbound-full-relay, [2a02:b10c:f747:1:ef:fake:ipv6:addr]:6333) with 8 bytes +inbound 'pong' msg from peer 11 (outbound-full-relay, [2a02:b10c:f747:1:ef:fake:ipv6:addr]:6333) with 8 bytes +inbound 'inv' msg from peer 16 (outbound-full-relay, XX.XX.XXX.121:6333) with 37 bytes +outbound 'getdata' msg to peer 16 (outbound-full-relay, XX.XX.XXX.121:6333) with 37 bytes +inbound 'tx' msg from peer 16 (outbound-full-relay, XX.XX.XXX.121:6333) with 222 bytes +outbound 'inv' msg to peer 9 (outbound-full-relay, faketorv3addressa2ufa6odvoi3s77j4uegey0xb10csyfyve2t33curbyd.onion:6333) with 37 bytes +outbound 'inv' msg to peer 7 (outbound-full-relay, XX.XX.XXX.242:6333) with 37 bytes … ``` @@ -91,16 +91,16 @@ Lists selectable peers and traffic and connection information. Navigate with UP/DOWN or J/K and select a peer with ENTER or SPACE to see individual P2P messages PEER OUTBOUND INBOUND TYPE ADDR - 0 46 398 byte 61 1407590 byte block-relay-only XX.XX.XXX.196:8333 - 11 1156 253570 byte 3431 2394924 byte outbound-full-relay XXX.X.XX.179:8333 + 0 46 398 byte 61 1407590 byte block-relay-only XX.XX.XXX.196:6333 + 11 1156 253570 byte 3431 2394924 byte outbound-full-relay XXX.X.XX.179:6333 13 3425 1809620 byte 1236 305458 byte inbound XXX.X.X.X:60380 - 16 1046 241633 byte 1589 1199220 byte outbound-full-relay 4faketorv2pbfu7x.onion:8333 - 19 577 181679 byte 390 148951 byte outbound-full-relay kfake4vctorjv2o2.onion:8333 - 20 11 1248 byte 13 1283 byte block-relay-only [2600:fake:64d9:b10c:4436:aaaa:fe:bb]:8333 - 21 11 1248 byte 13 1299 byte block-relay-only XX.XXX.X.155:8333 - 22 5 103 byte 1 102 byte feeler XX.XX.XXX.173:8333 - 23 11 1248 byte 12 1255 byte block-relay-only XX.XXX.XXX.220:8333 - 24 3 103 byte 1 102 byte feeler XXX.XXX.XXX.64:8333 + 16 1046 241633 byte 1589 1199220 byte outbound-full-relay 4faketorv2pbfu7x.onion:6333 + 19 577 181679 byte 390 148951 byte outbound-full-relay kfake4vctorjv2o2.onion:6333 + 20 11 1248 byte 13 1283 byte block-relay-only [2600:fake:64d9:b10c:4436:aaaa:fe:bb]:6333 + 21 11 1248 byte 13 1299 byte block-relay-only XX.XXX.X.155:6333 + 22 5 103 byte 1 102 byte feeler XX.XX.XXX.173:6333 + 23 11 1248 byte 12 1255 byte block-relay-only XX.XXX.XXX.220:6333 + 24 3 103 byte 1 102 byte feeler XXX.XXX.XXX.64:6333 … ``` @@ -108,7 +108,7 @@ Showing recent P2P messages between our node and a selected peer. ``` ---------------------------------------------------------------------- - | PEER 16 (4faketorv2pbfu7x.onion:8333) | + | PEER 16 (4faketorv2pbfu7x.onion:6333) | | OUR NODE outbound-full-relay PEER | | <--- sendcmpct (9 bytes) | | inv (37 byte) ---> | @@ -157,9 +157,9 @@ $ python3 contrib/tracing/log_raw_p2p_msgs.py ./src/vincoind Logging raw P2P messages. Messages larger that about 32kb will be cut off! Some messages might be lost! - outbound msg 'inv' from peer 4 (outbound-full-relay, XX.XXX.XX.4:8333) with 253 bytes: 0705000000be2245c8f844c9f763748e1a7… + outbound msg 'inv' from peer 4 (outbound-full-relay, XX.XXX.XX.4:6333) with 253 bytes: 0705000000be2245c8f844c9f763748e1a7… … -Warning: incomplete message (only 32568 out of 53552 bytes)! inbound msg 'tx' from peer 32 (outbound-full-relay, XX.XXX.XXX.43:8333) with 53552 bytes: 020000000001fd3c01939c85ad6756ed9fc… +Warning: incomplete message (only 32568 out of 53552 bytes)! inbound msg 'tx' from peer 32 (outbound-full-relay, XX.XXX.XXX.43:6333) with 53552 bytes: 020000000001fd3c01939c85ad6756ed9fc… … Possibly lost 2 samples ``` diff --git a/doc/developer-notes.md b/doc/developer-notes.md index df6a50957196f..a0e49a0cc8890 100644 --- a/doc/developer-notes.md +++ b/doc/developer-notes.md @@ -661,7 +661,7 @@ Threads : Universal plug-and-play startup/shutdown. - [ThreadSocketHandler (`b-net`)](https://doxygen.vincoincore.org/class_c_connman.html#a765597cbfe99c083d8fa3d61bb464e34) - : Sends/Receives data from peers on port 8333. + : Sends/Receives data from peers on port 6333. - [ThreadOpenAddedConnections (`b-addcon`)](https://doxygen.vincoincore.org/class_c_connman.html#a0b787caf95e52a346a2b31a580d60a62) : Opens network connections to added nodes. diff --git a/doc/tor.md b/doc/tor.md index 69b002a0ccbf7..c952369fe03d2 100644 --- a/doc/tor.md +++ b/doc/tor.md @@ -156,11 +156,11 @@ You can also manually configure your node to be reachable from the Tor network. Add these lines to your `/etc/tor/torrc` (or equivalent config file): HiddenServiceDir /var/lib/tor/vincoin-service/ - HiddenServicePort 8333 127.0.0.1:8334 + HiddenServicePort 6333 127.0.0.1:6334 The directory can be different of course, but virtual port numbers should be equal to -your vincoind's P2P listen port (8333 by default), and target addresses and ports -should be equal to binding address and port for inbound Tor connections (127.0.0.1:8334 by default). +your vincoind's P2P listen port (6333 by default), and target addresses and ports +should be equal to binding address and port for inbound Tor connections (127.0.0.1:6334 by default). -externalip=X You can tell vincoin about its publicly reachable addresses using this option, and this can be an onion address. Given the above @@ -200,7 +200,7 @@ as well, use `discover` instead: ./vincoind ... -discover -and open port 8333 on your firewall (or use port mapping, i.e., `-upnp` or `-natpmp`). +and open port 6333 on your firewall (or use port mapping, i.e., `-upnp` or `-natpmp`). If you only want to use Tor to reach .onion addresses, but not use it as a proxy for normal IPv4/IPv6 communication, use: diff --git a/doc/zmq.md b/doc/zmq.md index 976addb316bed..cc89a2282e7de 100644 --- a/doc/zmq.md +++ b/doc/zmq.md @@ -82,9 +82,9 @@ The high water mark value must be an integer greater than or equal to 0. For instance: - $ vincoind -zmqpubhashtx=tcp://127.0.0.1:28332 \ - -zmqpubhashtx=tcp://192.168.1.2:28332 \ - -zmqpubhashblock="tcp://[::1]:28333" \ + $ vincoind -zmqpubhashtx=tcp://127.0.0.1:26332 \ + -zmqpubhashtx=tcp://192.168.1.2:26332 \ + -zmqpubhashblock="tcp://[::1]:26333" \ -zmqpubrawtx=ipc:///tmp/vincoind.tx.raw \ -zmqpubhashtxhwm=10000 diff --git a/src/bench/addrman.cpp b/src/bench/addrman.cpp index 772766b2fdb8b..ea864d1cf0bba 100644 --- a/src/bench/addrman.cpp +++ b/src/bench/addrman.cpp @@ -104,7 +104,7 @@ static void AddrManSelectFromAlmostEmpty(benchmark::Bench& bench) AddrMan addrman{EMPTY_NETGROUPMAN, /*deterministic=*/false, ADDRMAN_CONSISTENCY_CHECK_RATIO}; // Add one address to the new table - CService addr = Lookup("250.3.1.1", 8333, false).value(); + CService addr = Lookup("250.3.1.1", 6333, false).value(); addrman.Add({CAddress(addr, NODE_NONE)}, addr); bench.run([&] { diff --git a/src/netbase.h b/src/netbase.h index fe68193f8e5b1..9fdc25a95cf58 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -184,7 +184,7 @@ std::optional LookupHost(const std::string& name, bool fAllowLookup, D * @param name The string representing a service. Could be a name or a * numerical IP address (IPv6 addresses should be in their * disambiguated bracketed form), optionally followed by a uint16_t port - * number. (e.g. example.com:8333 or + * number. (e.g. example.com:6333 or * [2001:db8:85a3:8d3:1319:8a2e:370:7348]:420) * @param portDefault The default port for resulting services if not specified * by the service string. diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index fcccef69580d3..083a5872c0d85 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -317,8 +317,8 @@ static RPCHelpMan addnode() }, RPCResult{RPCResult::Type::NONE, "", ""}, RPCExamples{ - HelpExampleCli("addnode", "\"192.168.0.6:8333\" \"onetry\" true") - + HelpExampleRpc("addnode", "\"192.168.0.6:8333\", \"onetry\" true") + HelpExampleCli("addnode", "\"192.168.0.6:6333\" \"onetry\" true") + + HelpExampleRpc("addnode", "\"192.168.0.6:6333\", \"onetry\" true") }, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue { @@ -380,8 +380,8 @@ static RPCHelpMan addconnection() { RPCResult::Type::STR, "connection_type", "Type of connection opened." }, }}, RPCExamples{ - HelpExampleCli("addconnection", "\"192.168.0.6:8333\" \"outbound-full-relay\" true") - + HelpExampleRpc("addconnection", "\"192.168.0.6:8333\" \"outbound-full-relay\" true") + HelpExampleCli("addconnection", "\"192.168.0.6:6333\" \"outbound-full-relay\" true") + + HelpExampleRpc("addconnection", "\"192.168.0.6:6333\" \"outbound-full-relay\" true") }, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue { @@ -438,9 +438,9 @@ static RPCHelpMan disconnectnode() }, RPCResult{RPCResult::Type::NONE, "", ""}, RPCExamples{ - HelpExampleCli("disconnectnode", "\"192.168.0.6:8333\"") + HelpExampleCli("disconnectnode", "\"192.168.0.6:6333\"") + HelpExampleCli("disconnectnode", "\"\" 1") - + HelpExampleRpc("disconnectnode", "\"192.168.0.6:8333\"") + + HelpExampleRpc("disconnectnode", "\"192.168.0.6:6333\"") + HelpExampleRpc("disconnectnode", "\"\", 1") }, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue @@ -964,8 +964,8 @@ static RPCHelpMan addpeeraddress() }, }, RPCExamples{ - HelpExampleCli("addpeeraddress", "\"1.2.3.4\" 8333 true") - + HelpExampleRpc("addpeeraddress", "\"1.2.3.4\", 8333, true") + HelpExampleCli("addpeeraddress", "\"1.2.3.4\" 6333 true") + + HelpExampleRpc("addpeeraddress", "\"1.2.3.4\", 6333, true") }, [&](const RPCHelpMan& self, const JSONRPCRequest& request) -> UniValue { diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index 23e67c5138c5c..036e07f30489c 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -72,15 +72,15 @@ BOOST_AUTO_TEST_CASE(addrman_simple) BOOST_CHECK_EQUAL(addr_null.ToStringAddrPort(), "[::]:0"); // Test: Does Addrman::Add work as expected. - CService addr1 = ResolveService("250.1.1.1", 8333); + CService addr1 = ResolveService("250.1.1.1", 6333); BOOST_CHECK(addrman->Add({CAddress(addr1, NODE_NONE)}, source)); BOOST_CHECK_EQUAL(addrman->Size(), 1U); auto addr_ret1 = addrman->Select().first; - BOOST_CHECK_EQUAL(addr_ret1.ToStringAddrPort(), "250.1.1.1:8333"); + BOOST_CHECK_EQUAL(addr_ret1.ToStringAddrPort(), "250.1.1.1:6333"); // Test: Does IP address deduplication work correctly. // Expected dup IP should not be added. - CService addr1_dup = ResolveService("250.1.1.1", 8333); + CService addr1_dup = ResolveService("250.1.1.1", 6333); BOOST_CHECK(!addrman->Add({CAddress(addr1_dup, NODE_NONE)}, source)); BOOST_CHECK_EQUAL(addrman->Size(), 1U); @@ -91,15 +91,15 @@ BOOST_AUTO_TEST_CASE(addrman_simple) // hash collisions may occur. But we can always be sure of at least one // success. - CService addr2 = ResolveService("250.1.1.2", 8333); + CService addr2 = ResolveService("250.1.1.2", 6333); BOOST_CHECK(addrman->Add({CAddress(addr2, NODE_NONE)}, source)); BOOST_CHECK(addrman->Size() >= 1); // Test: reset addrman and test AddrMan::Add multiple addresses works as expected addrman = std::make_unique(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node)); std::vector vAddr; - vAddr.emplace_back(ResolveService("250.1.1.3", 8333), NODE_NONE); - vAddr.emplace_back(ResolveService("250.1.1.4", 8333), NODE_NONE); + vAddr.emplace_back(ResolveService("250.1.1.3", 6333), NODE_NONE); + vAddr.emplace_back(ResolveService("250.1.1.4", 6333), NODE_NONE); BOOST_CHECK(addrman->Add(vAddr, source)); BOOST_CHECK(addrman->Size() >= 1); } @@ -113,7 +113,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports) BOOST_CHECK_EQUAL(addrman->Size(), 0U); // Test 7; Addr with same IP but diff port does not replace existing addr. - CService addr1 = ResolveService("250.1.1.1", 8333); + CService addr1 = ResolveService("250.1.1.1", 6333); BOOST_CHECK(addrman->Add({CAddress(addr1, NODE_NONE)}, source)); BOOST_CHECK_EQUAL(addrman->Size(), 1U); @@ -121,7 +121,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports) BOOST_CHECK(addrman->Add({CAddress(addr1_port, NODE_NONE)}, source)); BOOST_CHECK_EQUAL(addrman->Size(), 2U); auto addr_ret2 = addrman->Select().first; - BOOST_CHECK(addr_ret2.ToStringAddrPort() == "250.1.1.1:8333" || addr_ret2.ToStringAddrPort() == "250.1.1.1:8334"); + BOOST_CHECK(addr_ret2.ToStringAddrPort() == "250.1.1.1:6333" || addr_ret2.ToStringAddrPort() == "250.1.1.1:8334"); // Test: Add same IP but diff port to tried table; this converts the entry with // the specified port to tried, but not the other. @@ -129,7 +129,7 @@ BOOST_AUTO_TEST_CASE(addrman_ports) BOOST_CHECK_EQUAL(addrman->Size(), 2U); bool new_only = true; auto addr_ret3 = addrman->Select(new_only).first; - BOOST_CHECK_EQUAL(addr_ret3.ToStringAddrPort(), "250.1.1.1:8333"); + BOOST_CHECK_EQUAL(addr_ret3.ToStringAddrPort(), "250.1.1.1:6333"); } BOOST_AUTO_TEST_CASE(addrman_select) @@ -141,7 +141,7 @@ BOOST_AUTO_TEST_CASE(addrman_select) CNetAddr source = ResolveIP("252.2.2.2"); // Add 1 address to the new table - CService addr1 = ResolveService("250.1.1.1", 8333); + CService addr1 = ResolveService("250.1.1.1", 6333); BOOST_CHECK(addrman->Add({CAddress(addr1, NODE_NONE)}, source)); BOOST_CHECK_EQUAL(addrman->Size(), 1U); @@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE(addrman_select) BOOST_CHECK_EQUAL(addrman->Size(), 1U); // Add one address to the new table - CService addr2 = ResolveService("250.3.1.1", 8333); + CService addr2 = ResolveService("250.3.1.1", 6333); BOOST_CHECK(addrman->Add({CAddress(addr2, NODE_NONE)}, addr2)); BOOST_CHECK(addrman->Select(/*new_only=*/true).first == addr2); @@ -166,18 +166,18 @@ BOOST_AUTO_TEST_CASE(addrman_select) CService addr4 = ResolveService("250.3.3.3", 9999); BOOST_CHECK(addrman->Add({CAddress(addr3, NODE_NONE)}, addr2)); - BOOST_CHECK(addrman->Add({CAddress(addr4, NODE_NONE)}, ResolveService("250.4.1.1", 8333))); + BOOST_CHECK(addrman->Add({CAddress(addr4, NODE_NONE)}, ResolveService("250.4.1.1", 6333))); // Add three addresses to tried table. - CService addr5 = ResolveService("250.4.4.4", 8333); + CService addr5 = ResolveService("250.4.4.4", 6333); CService addr6 = ResolveService("250.4.5.5", 7777); - CService addr7 = ResolveService("250.4.6.6", 8333); + CService addr7 = ResolveService("250.4.6.6", 6333); BOOST_CHECK(addrman->Add({CAddress(addr5, NODE_NONE)}, addr3)); BOOST_CHECK(addrman->Good(CAddress(addr5, NODE_NONE))); BOOST_CHECK(addrman->Add({CAddress(addr6, NODE_NONE)}, addr3)); BOOST_CHECK(addrman->Good(CAddress(addr6, NODE_NONE))); - BOOST_CHECK(addrman->Add({CAddress(addr7, NODE_NONE)}, ResolveService("250.1.1.3", 8333))); + BOOST_CHECK(addrman->Add({CAddress(addr7, NODE_NONE)}, ResolveService("250.1.1.3", 6333))); BOOST_CHECK(addrman->Good(CAddress(addr7, NODE_NONE))); // 6 addrs + 1 addr from last test = 7. @@ -199,7 +199,7 @@ BOOST_AUTO_TEST_CASE(addrman_select_by_network) // add ipv4 address to the new table CNetAddr source = ResolveIP("252.2.2.2"); - CService addr1 = ResolveService("250.1.1.1", 8333); + CService addr1 = ResolveService("250.1.1.1", 6333); BOOST_CHECK(addrman->Add({CAddress(addr1, NODE_NONE)}, source)); BOOST_CHECK(addrman->Select(/*new_only=*/true, NET_IPV4).first == addr1); @@ -269,7 +269,7 @@ BOOST_AUTO_TEST_CASE(addrman_select_special) BOOST_CHECK(addrman->Good(i2p_addr)); // add ipv4 address to the new table - CService addr1 = ResolveService("250.1.1.3", 8333); + CService addr1 = ResolveService("250.1.1.3", 6333); BOOST_CHECK(addrman->Add({CAddress(addr1, NODE_NONE)}, source)); // since the only ipv4 address is on the new table, ensure that the new @@ -310,7 +310,7 @@ BOOST_AUTO_TEST_CASE(addrman_new_collisions) BOOST_AUTO_TEST_CASE(addrman_new_multiplicity) { auto addrman = std::make_unique(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node)); - CAddress addr{CAddress(ResolveService("253.3.3.3", 8333), NODE_NONE)}; + CAddress addr{CAddress(ResolveService("253.3.3.3", 6333), NODE_NONE)}; const auto start_time{Now()}; addr.nTime = start_time; @@ -380,15 +380,15 @@ BOOST_AUTO_TEST_CASE(addrman_getaddr) std::vector vAddr1 = addrman->GetAddr(/*max_addresses=*/0, /*max_pct=*/0, /*network=*/std::nullopt); BOOST_CHECK_EQUAL(vAddr1.size(), 0U); - CAddress addr1 = CAddress(ResolveService("250.250.2.1", 8333), NODE_NONE); + CAddress addr1 = CAddress(ResolveService("250.250.2.1", 6333), NODE_NONE); addr1.nTime = Now(); // Set time so isTerrible = false CAddress addr2 = CAddress(ResolveService("250.251.2.2", 9999), NODE_NONE); addr2.nTime = Now(); - CAddress addr3 = CAddress(ResolveService("251.252.2.3", 8333), NODE_NONE); + CAddress addr3 = CAddress(ResolveService("251.252.2.3", 6333), NODE_NONE); addr3.nTime = Now(); - CAddress addr4 = CAddress(ResolveService("252.253.3.4", 8333), NODE_NONE); + CAddress addr4 = CAddress(ResolveService("252.253.3.4", 6333), NODE_NONE); addr4.nTime = Now(); - CAddress addr5 = CAddress(ResolveService("252.254.4.5", 8333), NODE_NONE); + CAddress addr5 = CAddress(ResolveService("252.254.4.5", 6333), NODE_NONE); addr5.nTime = Now(); CNetAddr source1 = ResolveIP("250.1.2.1"); CNetAddr source2 = ResolveIP("250.2.3.3"); @@ -434,7 +434,7 @@ BOOST_AUTO_TEST_CASE(getaddr_unfiltered) auto addrman = std::make_unique(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node)); // Set time on this addr so isTerrible = false - CAddress addr1 = CAddress(ResolveService("250.250.2.1", 8333), NODE_NONE); + CAddress addr1 = CAddress(ResolveService("250.250.2.1", 6333), NODE_NONE); addr1.nTime = Now(); // Not setting time so this addr should be isTerrible = true CAddress addr2 = CAddress(ResolveService("250.251.2.2", 9999), NODE_NONE); @@ -450,7 +450,7 @@ BOOST_AUTO_TEST_CASE(getaddr_unfiltered) BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket_legacy) { - CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE); + CAddress addr1 = CAddress(ResolveService("250.1.1.1", 6333), NODE_NONE); CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE); CNetAddr source1 = ResolveIP("250.1.1.1"); @@ -501,7 +501,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket_legacy) BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket_legacy) { - CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE); + CAddress addr1 = CAddress(ResolveService("250.1.2.1", 6333), NODE_NONE); CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE); CNetAddr source1 = ResolveIP("250.1.2.1"); @@ -578,7 +578,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_tried_bucket) std::vector asmap = FromBytes(asmap_raw, sizeof(asmap_raw) * 8); NetGroupManager ngm_asmap{asmap}; - CAddress addr1 = CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE); + CAddress addr1 = CAddress(ResolveService("250.1.1.1", 6333), NODE_NONE); CAddress addr2 = CAddress(ResolveService("250.1.1.1", 9999), NODE_NONE); CNetAddr source1 = ResolveIP("250.1.1.1"); @@ -632,7 +632,7 @@ BOOST_AUTO_TEST_CASE(caddrinfo_get_new_bucket) std::vector asmap = FromBytes(asmap_raw, sizeof(asmap_raw) * 8); NetGroupManager ngm_asmap{asmap}; - CAddress addr1 = CAddress(ResolveService("250.1.2.1", 8333), NODE_NONE); + CAddress addr1 = CAddress(ResolveService("250.1.2.1", 6333), NODE_NONE); CAddress addr2 = CAddress(ResolveService("250.1.2.1", 9999), NODE_NONE); CNetAddr source1 = ResolveIP("250.1.2.1"); @@ -971,7 +971,7 @@ BOOST_AUTO_TEST_CASE(load_addrman) AddrMan addrman{EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node)}; std::optional addr1, addr2, addr3, addr4; - addr1 = Lookup("250.7.1.1", 8333, false); + addr1 = Lookup("250.7.1.1", 6333, false); BOOST_CHECK(addr1.has_value()); addr2 = Lookup("250.7.2.2", 9999, false); BOOST_CHECK(addr2.has_value()); @@ -983,7 +983,7 @@ BOOST_AUTO_TEST_CASE(load_addrman) BOOST_CHECK(!addr4.has_value()); // Add three addresses to new table. - const std::optional source{Lookup("252.5.1.1", 8333, false)}; + const std::optional source{Lookup("252.5.1.1", 6333, false)}; BOOST_CHECK(source.has_value()); std::vector addresses{CAddress(addr1.value(), NODE_NONE), CAddress(addr2.value(), NODE_NONE), CAddress(addr3.value(), NODE_NONE)}; BOOST_CHECK(addrman.Add(addresses, source.value())); @@ -1071,7 +1071,7 @@ BOOST_AUTO_TEST_CASE(addrman_update_address) // Tests updating nTime via Connected() and nServices via SetServices() and Add() auto addrman = std::make_unique(EMPTY_NETGROUPMAN, DETERMINISTIC, GetCheckRatio(m_node)); CNetAddr source{ResolveIP("252.2.2.2")}; - CAddress addr{CAddress(ResolveService("250.1.1.1", 8333), NODE_NONE)}; + CAddress addr{CAddress(ResolveService("250.1.1.1", 6333), NODE_NONE)}; const auto start_time{Now() - 10000s}; addr.nTime = start_time; @@ -1097,7 +1097,7 @@ BOOST_AUTO_TEST_CASE(addrman_update_address) BOOST_CHECK_EQUAL(vAddr2.at(0).nServices, NODE_NETWORK_LIMITED); // Updating an existing addr through Add() (used in gossip relay) can add additional services but can't remove existing ones. - CAddress addr_v2{CAddress(ResolveService("250.1.1.1", 8333), NODE_P2P_V2)}; + CAddress addr_v2{CAddress(ResolveService("250.1.1.1", 6333), NODE_P2P_V2)}; addr_v2.nTime = start_time; BOOST_CHECK(!addrman->Add({addr_v2}, source)); std::vector vAddr3{addrman->GetAddr(/*max_addresses=*/0, /*max_pct=*/0, /*network=*/std::nullopt)}; @@ -1135,10 +1135,10 @@ BOOST_AUTO_TEST_CASE(addrman_size) BOOST_CHECK_EQUAL(addrman->Size(/*net=*/NET_IPV4, /*in_new=*/false), 0U); // add two ipv4 addresses, one to tried and new - const CAddress addr1{ResolveService("250.1.1.1", 8333), NODE_NONE}; + const CAddress addr1{ResolveService("250.1.1.1", 6333), NODE_NONE}; BOOST_CHECK(addrman->Add({addr1}, source)); BOOST_CHECK(addrman->Good(addr1)); - const CAddress addr2{ResolveService("250.1.1.2", 8333), NODE_NONE}; + const CAddress addr2{ResolveService("250.1.1.2", 6333), NODE_NONE}; BOOST_CHECK(addrman->Add({addr2}, source)); BOOST_CHECK_EQUAL(addrman->Size(/*net=*/std::nullopt, /*in_new=*/std::nullopt), 2U); diff --git a/src/test/fuzz/addrman.cpp b/src/test/fuzz/addrman.cpp index f37f48ea9491a..b5aca18921d46 100644 --- a/src/test/fuzz/addrman.cpp +++ b/src/test/fuzz/addrman.cpp @@ -101,7 +101,7 @@ void FillAddrman(AddrMan& addrman, FuzzedDataProvider& fuzzed_data_provider) const size_t num_addresses = fast_random_context.randrange(500) + 1; // [1..500] for (size_t j = 0; j < num_addresses; ++j) { - const auto addr = CAddress{CService{RandAddr(fuzzed_data_provider, fast_random_context), 8333}, NODE_NETWORK}; + const auto addr = CAddress{CService{RandAddr(fuzzed_data_provider, fast_random_context), 6333}, NODE_NETWORK}; const std::chrono::seconds time_penalty{fast_random_context.randrange(100000001)}; addrman.Add({addr}, source, time_penalty); diff --git a/src/test/net_peer_connection_tests.cpp b/src/test/net_peer_connection_tests.cpp index 4cd690002a978..a110bd7966a83 100644 --- a/src/test/net_peer_connection_tests.cpp +++ b/src/test/net_peer_connection_tests.cpp @@ -90,7 +90,7 @@ BOOST_AUTO_TEST_CASE(test_addnode_getaddednodeinfo_and_connection_detection) // Connect a localhost peer. { - ASSERT_DEBUG_LOG("Added connection to 127.0.0.1:8333 peer=1"); + ASSERT_DEBUG_LOG("Added connection to 127.0.0.1:6333 peer=1"); AddPeer(id, nodes, *peerman, *connman, ConnectionType::MANUAL, /*onion_peer=*/false, /*address=*/"127.0.0.1"); BOOST_REQUIRE(nodes.back() != nullptr); } @@ -99,7 +99,7 @@ BOOST_AUTO_TEST_CASE(test_addnode_getaddednodeinfo_and_connection_detection) // address that resolves to multiple IPs, including that of the connected peer. // The connection attempt should consistently fail due to the check in ConnectNode(). for (int i = 0; i < 10; ++i) { - ASSERT_DEBUG_LOG("Not opening a connection to localhost, already connected to 127.0.0.1:8333"); + ASSERT_DEBUG_LOG("Not opening a connection to localhost, already connected to 127.0.0.1:6333"); BOOST_CHECK(!connman->ConnectNodePublic(*peerman, "localhost", ConnectionType::MANUAL)); } diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp index e6398e627c551..1006bd2ea8254 100644 --- a/src/test/net_tests.cpp +++ b/src/test/net_tests.cpp @@ -677,7 +677,7 @@ BOOST_AUTO_TEST_CASE(get_local_addr_for_peer_port) peer_out_in_addr.s_addr = htonl(0x01020304); CNode peer_out{/*id=*/0, /*sock=*/nullptr, - /*addrIn=*/CAddress{CService{peer_out_in_addr, 8333}, NODE_NETWORK}, + /*addrIn=*/CAddress{CService{peer_out_in_addr, 6333}, NODE_NETWORK}, /*nKeyedNetGroupIn=*/0, /*nLocalHostNonceIn=*/0, /*addrBindIn=*/CAddress{}, @@ -687,7 +687,7 @@ BOOST_AUTO_TEST_CASE(get_local_addr_for_peer_port) peer_out.fSuccessfullyConnected = true; peer_out.SetAddrLocal(peer_us); - // Without the fix peer_us:8333 is chosen instead of the proper peer_us:bind_port. + // Without the fix peer_us:6333 is chosen instead of the proper peer_us:bind_port. auto chosen_local_addr = GetLocalAddrForPeer(peer_out); BOOST_REQUIRE(chosen_local_addr); const CService expected{peer_us_addr, bind_port}; @@ -698,7 +698,7 @@ BOOST_AUTO_TEST_CASE(get_local_addr_for_peer_port) peer_in_in_addr.s_addr = htonl(0x05060708); CNode peer_in{/*id=*/0, /*sock=*/nullptr, - /*addrIn=*/CAddress{CService{peer_in_in_addr, 8333}, NODE_NETWORK}, + /*addrIn=*/CAddress{CService{peer_in_in_addr, 6333}, NODE_NETWORK}, /*nKeyedNetGroupIn=*/0, /*nLocalHostNonceIn=*/0, /*addrBindIn=*/CAddress{}, @@ -708,7 +708,7 @@ BOOST_AUTO_TEST_CASE(get_local_addr_for_peer_port) peer_in.fSuccessfullyConnected = true; peer_in.SetAddrLocal(peer_us); - // Without the fix peer_us:8333 is chosen instead of the proper peer_us:peer_us.GetPort(). + // Without the fix peer_us:6333 is chosen instead of the proper peer_us:peer_us.GetPort(). chosen_local_addr = GetLocalAddrForPeer(peer_in); BOOST_REQUIRE(chosen_local_addr); BOOST_CHECK(*chosen_local_addr == peer_us); @@ -835,7 +835,7 @@ BOOST_AUTO_TEST_CASE(initial_advertise_from_version_message) peer_in_addr.s_addr = htonl(0x01020304); CNode peer{/*id=*/0, /*sock=*/nullptr, - /*addrIn=*/CAddress{CService{peer_in_addr, 8333}, NODE_NETWORK}, + /*addrIn=*/CAddress{CService{peer_in_addr, 6333}, NODE_NETWORK}, /*nKeyedNetGroupIn=*/0, /*nLocalHostNonceIn=*/0, /*addrBindIn=*/CAddress{}, @@ -924,20 +924,20 @@ BOOST_AUTO_TEST_CASE(advertise_local_address) }; g_reachable_nets.Add(NET_CJDNS); - CAddress addr_ipv4{Lookup("1.2.3.4", 8333, false).value(), NODE_NONE}; + CAddress addr_ipv4{Lookup("1.2.3.4", 6333, false).value(), NODE_NONE}; BOOST_REQUIRE(addr_ipv4.IsValid()); BOOST_REQUIRE(addr_ipv4.IsIPv4()); - CAddress addr_ipv6{Lookup("1122:3344:5566:7788:9900:aabb:ccdd:eeff", 8333, false).value(), NODE_NONE}; + CAddress addr_ipv6{Lookup("1122:3344:5566:7788:9900:aabb:ccdd:eeff", 6333, false).value(), NODE_NONE}; BOOST_REQUIRE(addr_ipv6.IsValid()); BOOST_REQUIRE(addr_ipv6.IsIPv6()); - CAddress addr_ipv6_tunnel{Lookup("2002:3344:5566:7788:9900:aabb:ccdd:eeff", 8333, false).value(), NODE_NONE}; + CAddress addr_ipv6_tunnel{Lookup("2002:3344:5566:7788:9900:aabb:ccdd:eeff", 6333, false).value(), NODE_NONE}; BOOST_REQUIRE(addr_ipv6_tunnel.IsValid()); BOOST_REQUIRE(addr_ipv6_tunnel.IsIPv6()); BOOST_REQUIRE(addr_ipv6_tunnel.IsRFC3964()); - CAddress addr_teredo{Lookup("2001:0000:5566:7788:9900:aabb:ccdd:eeff", 8333, false).value(), NODE_NONE}; + CAddress addr_teredo{Lookup("2001:0000:5566:7788:9900:aabb:ccdd:eeff", 6333, false).value(), NODE_NONE}; BOOST_REQUIRE(addr_teredo.IsValid()); BOOST_REQUIRE(addr_teredo.IsIPv6()); BOOST_REQUIRE(addr_teredo.IsRFC4380()); @@ -952,7 +952,7 @@ BOOST_AUTO_TEST_CASE(advertise_local_address) BOOST_REQUIRE(addr_i2p.IsValid()); BOOST_REQUIRE(addr_i2p.IsI2P()); - CService service_cjdns{Lookup("fc00:3344:5566:7788:9900:aabb:ccdd:eeff", 8333, false).value(), NODE_NONE}; + CService service_cjdns{Lookup("fc00:3344:5566:7788:9900:aabb:ccdd:eeff", 6333, false).value(), NODE_NONE}; CAddress addr_cjdns{MaybeFlipIPv6toCJDNS(service_cjdns), NODE_NONE}; BOOST_REQUIRE(addr_cjdns.IsValid()); BOOST_REQUIRE(addr_cjdns.IsCJDNS()); diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index 4287b79f7fc9e..aef6c3b98c188 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -89,15 +89,15 @@ BOOST_AUTO_TEST_CASE(netbase_splithost) BOOST_CHECK(TestSplitHost("www.vincoincore.org:80", "www.vincoincore.org", 80)); BOOST_CHECK(TestSplitHost("[www.vincoincore.org]:80", "www.vincoincore.org", 80)); BOOST_CHECK(TestSplitHost("127.0.0.1", "127.0.0.1", 0)); - BOOST_CHECK(TestSplitHost("127.0.0.1:8333", "127.0.0.1", 8333)); + BOOST_CHECK(TestSplitHost("127.0.0.1:6333", "127.0.0.1", 6333)); BOOST_CHECK(TestSplitHost("[127.0.0.1]", "127.0.0.1", 0)); - BOOST_CHECK(TestSplitHost("[127.0.0.1]:8333", "127.0.0.1", 8333)); + BOOST_CHECK(TestSplitHost("[127.0.0.1]:6333", "127.0.0.1", 6333)); BOOST_CHECK(TestSplitHost("::ffff:127.0.0.1", "::ffff:127.0.0.1", 0)); - BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:8333", "::ffff:127.0.0.1", 8333)); - BOOST_CHECK(TestSplitHost("[::]:8333", "::", 8333)); - BOOST_CHECK(TestSplitHost("::8333", "::8333", 0)); - BOOST_CHECK(TestSplitHost(":8333", "", 8333)); - BOOST_CHECK(TestSplitHost("[]:8333", "", 8333)); + BOOST_CHECK(TestSplitHost("[::ffff:127.0.0.1]:6333", "::ffff:127.0.0.1", 6333)); + BOOST_CHECK(TestSplitHost("[::]:6333", "::", 6333)); + BOOST_CHECK(TestSplitHost("::6333", "::6333", 0)); + BOOST_CHECK(TestSplitHost(":6333", "", 6333)); + BOOST_CHECK(TestSplitHost("[]:6333", "", 6333)); BOOST_CHECK(TestSplitHost("", "", 0)); BOOST_CHECK(TestSplitHost(":65535", "", 65535)); BOOST_CHECK(TestSplitHost(":65536", ":65536", 0, false)); @@ -127,10 +127,10 @@ bool static TestParse(std::string src, std::string canon) BOOST_AUTO_TEST_CASE(netbase_lookupnumeric) { BOOST_CHECK(TestParse("127.0.0.1", "127.0.0.1:65535")); - BOOST_CHECK(TestParse("127.0.0.1:8333", "127.0.0.1:8333")); + BOOST_CHECK(TestParse("127.0.0.1:6333", "127.0.0.1:6333")); BOOST_CHECK(TestParse("::ffff:127.0.0.1", "127.0.0.1:65535")); BOOST_CHECK(TestParse("::", "[::]:65535")); - BOOST_CHECK(TestParse("[::]:8333", "[::]:8333")); + BOOST_CHECK(TestParse("[::]:6333", "[::]:6333")); BOOST_CHECK(TestParse("[127.0.0.1]", "127.0.0.1:65535")); BOOST_CHECK(TestParse(":::", "[::]:0")); @@ -591,7 +591,7 @@ BOOST_AUTO_TEST_CASE(isbadport) BOOST_CHECK(!IsBadPort(80)); BOOST_CHECK(!IsBadPort(443)); - BOOST_CHECK(!IsBadPort(8333)); + BOOST_CHECK(!IsBadPort(6333)); // Check all ports, there must be 80 bad ports in total. size_t total_bad_ports{0}; diff --git a/test/functional/feature_anchors.py b/test/functional/feature_anchors.py index 753ad8f161c9f..5498988216b21 100755 --- a/test/functional/feature_anchors.py +++ b/test/functional/feature_anchors.py @@ -14,7 +14,7 @@ INBOUND_CONNECTIONS = 5 BLOCK_RELAY_CONNECTIONS = 2 -ONION_ADDR = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:8333" +ONION_ADDR = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:6333" class AnchorsTest(VincoinTestFramework): diff --git a/test/functional/feature_asmap.py b/test/functional/feature_asmap.py index 6b22ac5818a21..2f942bf792fa1 100755 --- a/test/functional/feature_asmap.py +++ b/test/functional/feature_asmap.py @@ -44,7 +44,7 @@ def set_test_params(self): def fill_addrman(self, node_id): """Add 1 tried address to the addrman, followed by 1 new address.""" for addr, tried in [[0, True], [1, False]]: - self.nodes[node_id].addpeeraddress(address=f"101.{addr}.0.0", tried=tried, port=8333) + self.nodes[node_id].addpeeraddress(address=f"101.{addr}.0.0", tried=tried, port=6333) def test_without_asmap_arg(self): self.log.info('Test vincoind with no -asmap arg passed') diff --git a/test/functional/feature_proxy.py b/test/functional/feature_proxy.py index b5c719c94dc71..325ffd7ce9d1c 100755 --- a/test/functional/feature_proxy.py +++ b/test/functional/feature_proxy.py @@ -155,14 +155,14 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns): self.network_test(node, addr, network=NET_IPV6) if test_onion: - addr = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:8333" + addr = "pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion:6333" self.log.debug(f"Test: outgoing onion connection through node for address {addr}") node.addnode(addr, "onetry") cmd = proxies[2].queue.get() assert isinstance(cmd, Socks5Command) assert_equal(cmd.atyp, AddressType.DOMAINNAME) assert_equal(cmd.addr, b"pg6mmjiyjmcrsslvykfwnntlaru7p5svn6y2ymmju6nubxndf4pscryd.onion") - assert_equal(cmd.port, 8333) + assert_equal(cmd.port, 6333) if not auth: assert_equal(cmd.username, None) assert_equal(cmd.password, None) @@ -184,14 +184,14 @@ def node_test(self, node, *, proxies, auth, test_onion, test_cjdns): rv.append(cmd) self.network_test(node, addr, network=NET_CJDNS) - addr = "node.noumenon:8333" + addr = "node.noumenon:6333" self.log.debug(f"Test: outgoing DNS name connection through node for address {addr}") node.addnode(addr, "onetry") cmd = proxies[3].queue.get() assert isinstance(cmd, Socks5Command) assert_equal(cmd.atyp, AddressType.DOMAINNAME) assert_equal(cmd.addr, b"node.noumenon") - assert_equal(cmd.port, 8333) + assert_equal(cmd.port, 6333) if not auth: assert_equal(cmd.username, None) assert_equal(cmd.password, None) diff --git a/test/functional/p2p_addr_relay.py b/test/functional/p2p_addr_relay.py index 24d44876e4d76..4d56762886880 100755 --- a/test/functional/p2p_addr_relay.py +++ b/test/functional/p2p_addr_relay.py @@ -53,8 +53,9 @@ def on_addr(self, message): # relay_tests checks the content of the addr messages match # expectations based on the message creation in setup_addr_msg assert_equal(addr.nServices, 9) - if not 8333 <= addr.port < 8343: - raise AssertionError("Invalid addr.port of {} (8333-8342 expected)".format(addr.port)) + # Todo: change 8343 and 8342 port number + if not 6333 <= addr.port < 8343: + raise AssertionError("Invalid addr.port of {} (6333-8342 expected)".format(addr.port)) assert addr.ip.startswith('123.123.') def on_getaddr(self, message): @@ -118,7 +119,7 @@ def setup_addr_msg(self, num, sequential_ips=True): self.counter += 1 else: addr.ip = f"{random.randrange(128,169)}.{random.randrange(1,255)}.{random.randrange(1,255)}.{random.randrange(1,255)}" - addr.port = 8333 + i + addr.port = 6333 + i addrs.append(addr) msg = msg_addr() @@ -286,7 +287,7 @@ def getaddr_tests(self): first_octet = i >> 8 second_octet = i % 256 a = f"{first_octet}.{second_octet}.1.1" - self.nodes[0].addpeeraddress(a, 8333) + self.nodes[0].addpeeraddress(a, 6333) full_outbound_peer.send_and_ping(msg_getaddr()) block_relay_peer.send_and_ping(msg_getaddr()) diff --git a/test/functional/p2p_addrv2_relay.py b/test/functional/p2p_addrv2_relay.py index 2650ac99225bf..6d50df775d3e2 100755 --- a/test/functional/p2p_addrv2_relay.py +++ b/test/functional/p2p_addrv2_relay.py @@ -26,7 +26,7 @@ for i in range(10): addr = CAddress() addr.time = int(time.time()) + i - addr.port = 8333 + i + addr.port = 6333 + i addr.nServices = P2P_SERVICES # Add one I2P and one onion V3 address at an arbitrary position. if i == 5: diff --git a/test/functional/p2p_dns_seeds.py b/test/functional/p2p_dns_seeds.py index 74a7f13a6da66..05b36d2579207 100755 --- a/test/functional/p2p_dns_seeds.py +++ b/test/functional/p2p_dns_seeds.py @@ -56,7 +56,7 @@ def init_arg_tests(self): def existing_outbound_connections_test(self): # Make sure addrman is populated to enter the conditional where we # delay and potentially skip DNS seeding. - self.nodes[0].addpeeraddress("192.0.0.8", 8333) + self.nodes[0].addpeeraddress("192.0.0.8", 6333) self.log.info("Check that we *do not* query DNS seeds if we have 2 outbound connections") @@ -69,7 +69,7 @@ def existing_block_relay_connections_test(self): # Make sure addrman is populated to enter the conditional where we # delay and potentially skip DNS seeding. No-op when run after # existing_outbound_connections_test. - self.nodes[0].addpeeraddress("192.0.0.8", 8333) + self.nodes[0].addpeeraddress("192.0.0.8", 6333) self.log.info("Check that we *do* query DNS seeds if we only have 2 block-relay-only connections") @@ -99,7 +99,7 @@ def wait_time_tests(self): # Populate addrman with < 1000 addresses for i in range(5): a = f"192.0.0.{i}" - self.nodes[0].addpeeraddress(a, 8333) + self.nodes[0].addpeeraddress(a, 6333) # The delay should be 11 seconds with self.nodes[0].assert_debug_log(expected_msgs=["Waiting 11 seconds before querying DNS seeds.\n"]): @@ -111,7 +111,7 @@ def wait_time_tests(self): second_octet = i % 256 third_octet = i % 100 a = f"{first_octet}.{second_octet}.{third_octet}.1" - self.nodes[0].addpeeraddress(a, 8333) + self.nodes[0].addpeeraddress(a, 6333) if (i > 1000 and i % 100 == 0): # The addrman size is non-deterministic because new addresses # are sorted into buckets, potentially displacing existing diff --git a/test/functional/p2p_getaddr_caching.py b/test/functional/p2p_getaddr_caching.py index de506cd00447b..7f1fbd772d057 100755 --- a/test/functional/p2p_getaddr_caching.py +++ b/test/functional/p2p_getaddr_caching.py @@ -56,7 +56,7 @@ def run_test(self): first_octet = i >> 8 second_octet = i % 256 a = "{}.{}.1.1".format(first_octet, second_octet) - self.nodes[0].addpeeraddress(a, 8333) + self.nodes[0].addpeeraddress(a, 6333) # Need to make sure we hit MAX_ADDR_TO_SEND records in the addr response later because # only a fraction of all known addresses can be cached and returned. diff --git a/test/functional/p2p_i2p_ports.py b/test/functional/p2p_i2p_ports.py index c0a5162d90c01..decacbb86b607 100755 --- a/test/functional/p2p_i2p_ports.py +++ b/test/functional/p2p_i2p_ports.py @@ -21,7 +21,7 @@ def run_test(self): node = self.nodes[0] self.log.info("Ensure we don't try to connect if port!=0") - addr = "zsxwyo6qcn3chqzwxnseusqgsnuw3maqnztkiypyfxtya4snkoka.b32.i2p:8333" + addr = "zsxwyo6qcn3chqzwxnseusqgsnuw3maqnztkiypyfxtya4snkoka.b32.i2p:6333" raised = False try: with node.assert_debug_log(expected_msgs=[f"Error connecting to {addr}"]): diff --git a/test/functional/p2p_invalid_messages.py b/test/functional/p2p_invalid_messages.py index 3d82fa7d720a6..af2e281fc4b22 100755 --- a/test/functional/p2p_invalid_messages.py +++ b/test/functional/p2p_invalid_messages.py @@ -237,7 +237,7 @@ def test_addrv2_unrecognized_network(self): self.test_addrv2('unrecognized network', [ 'received: addrv2 (25 bytes)', - '9.9.9.9:8333', + '9.9.9.9:6333', 'Added 1 addresses', ], bytes.fromhex( diff --git a/test/functional/rpc_net.py b/test/functional/rpc_net.py index 4a93dbd6e98fe..c4d05b4f6f732 100755 --- a/test/functional/rpc_net.py +++ b/test/functional/rpc_net.py @@ -257,7 +257,7 @@ def test_getnodeaddresses(self): # Add an IPv6 address to the address manager. ipv6_addr = "1233:3432:2434:2343:3234:2345:6546:4534" - self.nodes[0].addpeeraddress(address=ipv6_addr, port=8333) + self.nodes[0].addpeeraddress(address=ipv6_addr, port=6333) # Add 10,000 IPv4 addresses to the address manager. Due to the way bucket # and bucket positions are calculated, some of these addresses will collide. @@ -267,7 +267,7 @@ def test_getnodeaddresses(self): second_octet = i % 256 a = f"{first_octet}.{second_octet}.1.1" imported_addrs.append(a) - self.nodes[0].addpeeraddress(a, 8333) + self.nodes[0].addpeeraddress(a, 6333) # Fetch the addresses via the RPC and test the results. assert_equal(len(self.nodes[0].getnodeaddresses()), 1) # default count is 1 @@ -283,7 +283,7 @@ def test_getnodeaddresses(self): assert_greater_than(a["time"], 1527811200) # 1st June 2018 assert_equal(a["services"], P2P_SERVICES) assert a["address"] in imported_addrs - assert_equal(a["port"], 8333) + assert_equal(a["port"], 6333) assert_equal(a["network"], "ipv4") # Test the IPv6 address. @@ -291,7 +291,7 @@ def test_getnodeaddresses(self): assert_equal(len(res), 1) assert_equal(res[0]["address"], ipv6_addr) assert_equal(res[0]["network"], "ipv6") - assert_equal(res[0]["port"], 8333) + assert_equal(res[0]["port"], 6333) assert_equal(res[0]["services"], P2P_SERVICES) # Test for the absence of onion, I2P and CJDNS addresses. @@ -321,7 +321,7 @@ def test_addpeeraddress(self): assert "addpeerinfo" in node.help("addpeerinfo") self.log.debug("Test that adding an empty address fails") - assert_equal(node.addpeeraddress(address="", port=8333), {"success": False}) + assert_equal(node.addpeeraddress(address="", port=6333), {"success": False}) assert_equal(node.getnodeaddresses(count=0), []) self.log.debug("Test that non-bool tried fails") @@ -334,20 +334,20 @@ def test_addpeeraddress(self): self.log.debug("Test that adding a valid address to the tried table succeeds") self.addr_time = int(time.time()) node.setmocktime(self.addr_time) - assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=8333), {"success": True}) + assert_equal(node.addpeeraddress(address="1.2.3.4", tried=True, port=6333), {"success": True}) with node.assert_debug_log(expected_msgs=["CheckAddrman: new 0, tried 1, total 1 started"]): addrs = node.getnodeaddresses(count=0) # getnodeaddresses re-runs the addrman checks assert_equal(len(addrs), 1) assert_equal(addrs[0]["address"], "1.2.3.4") - assert_equal(addrs[0]["port"], 8333) + assert_equal(addrs[0]["port"], 6333) self.log.debug("Test that adding an already-present tried address to the new and tried tables fails") for value in [True, False]: - assert_equal(node.addpeeraddress(address="1.2.3.4", tried=value, port=8333), {"success": False}) + assert_equal(node.addpeeraddress(address="1.2.3.4", tried=value, port=6333), {"success": False}) assert_equal(len(node.getnodeaddresses(count=0)), 1) self.log.debug("Test that adding a second address, this time to the new table, succeeds") - assert_equal(node.addpeeraddress(address="2.0.0.0", port=8333), {"success": True}) + assert_equal(node.addpeeraddress(address="2.0.0.0", port=6333), {"success": True}) with node.assert_debug_log(expected_msgs=["CheckAddrman: new 1, tried 1, total 2 started"]): addrs = node.getnodeaddresses(count=0) # getnodeaddresses re-runs the addrman checks assert_equal(len(addrs), 2) @@ -451,7 +451,7 @@ def check_getrawaddrman_entries(expected): "entries": [ { "address": "2.0.0.0", - "port": 8333, + "port": 6333, "services": 9, "network": "ipv4", "source": "2.0.0.0", @@ -464,7 +464,7 @@ def check_getrawaddrman_entries(expected): "entries": [ { "address": "1.2.3.4", - "port": 8333, + "port": 6333, "services": 9, "network": "ipv4", "source": "1.2.3.4", From 2045196cc3c2b0ce2e876cdc5c9285edcf3b006b Mon Sep 17 00:00:00 2001 From: fkolakovic Date: Mon, 29 Apr 2024 14:32:53 +0200 Subject: [PATCH 2/5] change port number #2 (chainparams.cpp) --- src/kernel/chainparams.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 13e04c25fc1ee..36120f7ea48e1 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -116,7 +116,7 @@ class CMainParams : public CChainParams { pchMessageStart[1] = 0xbe; pchMessageStart[2] = 0xb4; pchMessageStart[3] = 0xd9; - nDefaultPort = 8333; + nDefaultPort = 6333; nPruneAfterHeight = 100000; m_assumed_blockchain_size = 590; m_assumed_chain_state_size = 9; @@ -229,7 +229,7 @@ class CTestNetParams : public CChainParams { pchMessageStart[1] = 0x11; pchMessageStart[2] = 0x09; pchMessageStart[3] = 0x07; - nDefaultPort = 18333; + nDefaultPort = 16333; nPruneAfterHeight = 1000; m_assumed_blockchain_size = 42; m_assumed_chain_state_size = 3; @@ -300,7 +300,7 @@ class SigNetParams : public CChainParams { // Hardcoded nodes can be removed once there are more DNS seeds vSeeds.emplace_back("178.128.221.177"); - vSeeds.emplace_back("v7ajjeirttkbnt32wpy3c6w3emwnfr3fkla7hpxcfokr3ysd3kqtzmqd.onion:38333"); + vSeeds.emplace_back("v7ajjeirttkbnt32wpy3c6w3emwnfr3fkla7hpxcfokr3ysd3kqtzmqd.onion:36333"); consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000001ad46be4862"); consensus.defaultAssumeValid = uint256S("0x0000013d778ba3f914530f11f6b69869c9fab54acff85acd7b8201d111f19b7f"); // 150000 @@ -365,7 +365,7 @@ class SigNetParams : public CChainParams { uint256 hash = h.GetHash(); std::copy_n(hash.begin(), 4, pchMessageStart.begin()); - nDefaultPort = 38333; + nDefaultPort = 36333; nPruneAfterHeight = 1000; genesis = CreateGenesisBlock(1598918400, 52613770, 0x1e0377ae, 1, 50 * COIN); From 9ca0a5f90d8601737484e207343ffd9c768ad663 Mon Sep 17 00:00:00 2001 From: fkolakovic Date: Mon, 29 Apr 2024 15:29:30 +0200 Subject: [PATCH 3/5] remove default seeding logic and seed nodes --- contrib/seeds/nodes_main.txt | 897 +--------------------------- contrib/seeds/nodes_main_manual.txt | 95 +-- contrib/seeds/nodes_test.txt | 89 +-- src/kernel/chainparams.cpp | 37 +- src/kernel/chainparams.h | 4 +- 5 files changed, 9 insertions(+), 1113 deletions(-) diff --git a/contrib/seeds/nodes_main.txt b/contrib/seeds/nodes_main.txt index 9a39317e78dcc..e73be22ff19fb 100644 --- a/contrib/seeds/nodes_main.txt +++ b/contrib/seeds/nodes_main.txt @@ -1,896 +1 @@ -1.65.195.98:8333 # AS4760 -2.59.236.56:8333 # AS24904 -2.83.114.20:8333 # AS8657 -2.248.194.16:8333 # AS3301 -5.2.154.6:8333 # AS8708 -5.101.140.30:8333 # AS42831 -5.128.87.126:8333 # AS31200 -5.144.21.49:8333 # AS15600 -5.172.132.104:8333 # AS15600 -5.188.62.18:8333 # AS34665 -5.200.2.180:8333 # AS49544 -8.129.184.255:8333 # AS37963 -8.209.105.138:8333 # AS45102 -12.34.98.148:8333 # AS7018 -14.199.102.151:8333 # AS9269 -18.27.79.17:8333 # AS3 -18.27.124.231:8333 # AS3 -18.216.249.151:8333 # AS16509 -23.88.155.58:8333 # AS10242 -23.93.101.158:8333 # AS46375 -23.109.156.76:8333 # AS7979 -23.175.0.220:8333 # AS395502 -23.175.0.222:8333 # AS395502 -24.232.36.225:8333 # AS7303 -27.124.108.19:8333 # AS58511 -27.148.206.140:8333 # AS4134 -31.7.70.195:8333 # AS49666 -31.25.98.16:8333 # AS48635 -31.41.23.249:8333 # AS31287 -31.47.102.92:8333 # AS8251 -31.47.202.112:8333 # AS34385 -31.165.78.146:8333 # AS6730 -31.165.228.138:8333 # AS6730 -34.64.101.4:8333 # AS139070 -34.105.19.97:8333 # AS15169 -34.126.107.179:8333 # AS396982 -34.126.115.35:8333 # AS396982 -35.245.186.117:8333 # AS15169 -37.15.60.144:8333 # AS12479 -37.16.105.63:8333 # AS20904 -37.120.155.34:8333 # AS9009 -37.120.179.29:8333 # AS47147 -37.139.102.73:8333 # AS35816 -37.193.227.16:8333 # AS31200 -37.220.135.151:8333 # AS41206 -38.53.129.67:8333 # AS40237 -38.54.14.89:8333 # AS138915 -38.141.134.140:8333 # AS174 -38.145.151.150:8333 # AS40545 -41.72.154.66:8333 # AS37153 -43.143.203.198:8333 # AS45090 -45.15.124.117:8333 # AS35913 -45.43.97.103:8333 # AS26827 -45.44.213.116:8333 # AS54198 -45.58.187.101:8333 # AS46844 -45.79.192.236:8333 # AS63949 -45.81.241.97:8333 # AS30823 -45.83.220.102:8333 # AS39351 -45.83.241.46:8333 # AS206238 -45.87.106.57:8333 # AS39238 -45.129.38.5:8333 # AS49666 -45.130.20.177:8333 # AS3214 -45.134.142.40:8333 # AS60068 -45.135.4.143:8333 # AS25596 -45.135.92.127:8333 # AS12555 -45.145.188.112:8333 # AS206805 -46.23.87.218:8333 # AS51088 -46.32.50.98:8333 # AS39642 -46.32.78.17:8333 # AS48416 -46.59.40.91:8333 # AS8473 -46.138.246.77:8333 # AS8359 -46.166.142.2:8333 # AS43350 -46.166.162.59:8333 # AS16125 -46.175.178.3:8333 # AS28725 -46.188.15.6:8333 # AS39153 -46.188.30.118:8333 # AS39153 -46.223.223.216:8333 # AS51185 -46.226.18.135:8333 # AS52176 -47.88.86.79:8333 # AS45102 -47.148.7.69:8333 # AS5650 -47.198.223.60:8333 # AS5650 -50.2.13.164:8333 # AS62904 -50.4.135.84:8333 # AS12083 -50.53.39.237:8333 # AS20055 -50.53.250.162:8333 # AS20055 -50.68.121.44:8333 # AS6327 -50.117.132.178:8333 # AS577 -51.154.62.103:8333 # AS15796 -51.158.150.155:8333 # AS12876 -51.250.46.215:8333 # AS200350 -54.176.63.16:8333 # AS16509 -58.158.0.86:8333 # AS2519 -60.205.205.119:8333 # AS37963 -61.74.99.193:8333 # AS4766 -61.92.59.104:8333 # AS9269 -62.122.173.171:8333 # AS50245 -62.171.129.32:8333 # AS51167 -62.178.27.239:8333 # AS8412 -62.209.210.3:8333 # AS6855 -62.215.127.73:8333 # AS21050 -62.238.148.104:8333 # AS15435 -62.245.153.8:8333 # AS8767 -64.146.136.45:8333 # AS16713 -65.21.134.184:8333 # AS24940 -66.18.13.146:8333 # AS13767 -66.23.233.43:8333 # AS19318 -66.27.98.216:8333 # AS20001 -66.29.129.218:8333 # AS22612 -66.38.94.13:8333 # AS11979 -66.45.141.46:8333 # AS11232 -66.58.243.215:8333 # AS8047 -66.114.33.49:8333 # AS23175 -66.198.211.167:8333 # AS10835 -66.208.64.128:8333 # AS10352 -66.219.196.170:8333 # AS29933 -67.210.228.203:8333 # AS7819 -68.183.75.251:8333 # AS14061 -68.194.125.140:8333 # AS6128 -68.199.120.17:8333 # AS6128 -69.4.94.226:8333 # AS36352 -69.8.175.201:8333 # AS21766 -69.59.18.22:8333 # AS397444 -69.196.152.33:8333 # AS5645 -69.228.219.124:8333 # AS7018 -70.64.27.12:8333 # AS6327 -70.160.240.132:8333 # AS22773 -71.79.109.128:8333 # AS7843 -71.184.193.75:8333 # AS701 -72.15.59.173:8333 # AS21949 -72.48.253.168:8333 # AS7459 -72.207.171.210:8333 # AS22773 -73.117.132.138:8333 # AS7922 -73.212.226.59:8333 # AS7922 -74.76.151.110:8333 # AS7843 -74.91.115.229:8333 # AS14586 -74.118.137.119:8333 # AS20326 -74.213.175.108:8333 # AS21949 -74.213.251.239:8333 # AS14978 -74.220.255.190:8333 # AS23175 -74.221.189.109:8333 # AS26827 -75.83.203.225:8333 # AS20001 -75.172.52.186:8333 # AS209 -76.24.143.22:8333 # AS1351 -76.69.202.247:8333 # AS577 -76.73.198.242:8333 # AS12083 -76.119.248.240:8333 # AS1351 -77.20.48.144:8333 # AS3209 -77.22.152.239:8333 # AS204028 -77.37.224.222:8333 # AS42610 -77.48.196.234:8333 # AS16019 -77.70.16.245:8333 # AS8717 -77.162.190.90:8333 # AS1136 -78.20.227.249:8333 # AS6848 -78.21.167.8:8333 # AS6848 -78.35.147.203:8333 # AS8422 -78.108.108.25:8333 # AS8251 -78.154.237.60:8333 # AS9155 -79.11.31.76:8333 # AS3269 -79.87.88.235:8333 # AS15557 -79.101.1.25:8333 # AS8400 -79.124.7.241:8333 # AS203380 -79.124.7.253:8333 # AS203380 -79.150.68.42:8333 # AS3352 -79.249.10.53:8333 # AS3320 -80.82.21.77:8333 # AS42927 -80.82.76.59:8333 # AS202425 -80.88.172.227:8333 # AS31263 -80.93.213.246:8333 # AS42910 -80.111.142.213:8333 # AS6830 -80.208.227.134:8333 # AS62282 -80.208.228.9:8333 # AS62282 -80.209.64.86:8333 # AS31027 -80.229.28.60:8333 # AS2856 -81.7.16.182:8333 # AS35366 -81.19.10.2:8333 # AS24641 -81.162.196.43:8333 # AS34955 -81.171.22.143:8333 # AS60781 -81.172.221.4:8333 # AS12430 -81.224.44.164:8333 # AS3301 -81.245.96.36:8333 # AS5432 -82.1.68.54:8333 # AS5089 -82.66.10.11:8333 # AS12322 -82.66.211.31:8333 # AS12322 -82.71.4.154:8333 # AS13037 -82.96.96.40:8333 # AS29686 -82.116.50.101:8333 # AS30936 -82.136.98.249:8333 # AS8821 -82.195.237.253:8333 # AS1836 -83.137.41.10:8333 # AS31394 -83.171.175.5:8333 # AS8767 -83.208.193.242:8333 # AS5610 -83.233.76.165:8333 # AS29518 -83.240.89.196:8333 # AS31246 -84.38.3.249:8333 # AS196691 -84.54.23.48:8333 # AS35913 -84.126.216.77:8333 # AS12430 -84.211.187.211:8333 # AS41164 -84.246.200.122:8333 # AS42455 -84.255.244.61:8333 # AS34779 -85.165.42.115:8333 # AS2119 -85.194.238.134:8333 # AS47605 -85.208.69.21:8333 # AS25091 -85.208.71.36:8333 # AS42275 -85.209.240.91:8333 # AS205581 -85.214.118.71:8333 # AS6724 -85.214.161.252:8333 # AS6724 -85.236.190.252:8333 # AS35032 -85.243.115.136:8333 # AS8657 -86.22.20.13:8333 # AS5089 -86.49.34.92:8333 # AS16019 -86.95.8.249:8333 # AS1136 -86.104.228.10:8333 # AS31638 -86.104.228.23:8333 # AS31638 -87.79.94.221:8333 # AS8422 -88.10.89.23:8333 # AS3352 -88.84.223.30:8333 # AS21453 -88.86.125.50:8333 # AS39392 -88.90.77.100:8333 # AS2119 -88.97.40.50:8333 # AS13037 -88.137.109.62:8333 # AS15557 -88.147.244.250:8333 # AS12389 -88.208.115.70:8333 # AS29208 -88.212.53.246:8333 # AS42841 -89.35.142.168:8333 # AS34977 -89.78.111.197:8333 # AS6830 -89.117.59.129:8333 # AS1239 -89.147.108.200:8333 # AS44735 -89.163.132.180:8333 # AS24961 -89.165.232.242:8333 # AS48161 -89.216.21.96:8333 # AS31042 -90.50.172.182:8333 # AS3215 -90.146.130.214:8333 # AS12605 -90.146.208.162:8333 # AS12605 -90.156.26.148:8333 # AS12741 -90.163.172.139:8333 # AS12479 -90.177.163.77:8333 # AS5610 -91.67.145.110:8333 # AS3209 -91.93.194.154:8333 # AS34984 -91.123.182.164:8333 # AS51648 -91.123.183.219:8333 # AS51792 -91.135.0.187:8333 # AS12496 -91.147.232.98:8333 # AS5483 -91.184.168.249:8333 # AS9063 -91.193.237.116:8333 # AS42916 -91.199.41.45:8333 # AS6866 -91.204.149.5:8333 # AS42765 -91.215.91.254:8333 # AS48078 -91.219.25.232:8333 # AS50448 -91.237.88.218:8333 # AS56813 -92.27.150.46:8333 # AS13285 -92.27.150.47:8333 # AS13285 -92.221.20.232:8333 # AS29695 -92.221.126.65:8333 # AS29695 -93.33.192.204:8333 # AS12874 -93.41.237.78:8333 # AS12874 -93.95.88.13:8333 # AS35434 -93.95.227.125:8333 # AS44735 -93.103.13.1:8333 # AS34779 -93.115.86.239:8333 # AS3223 -93.123.180.164:8333 # AS35539 -93.186.201.173:8333 # AS24961 -93.190.117.26:8333 # AS196881 -94.19.7.55:8333 # AS35807 -94.23.21.80:8333 # AS16276 -94.23.205.110:8333 # AS16276 -94.131.0.73:8333 # AS29632 -94.142.237.4:8333 # AS48926 -94.154.159.99:8333 # AS62240 -94.202.50.200:8333 # AS15802 -94.231.253.18:8333 # AS35224 -95.42.140.142:8333 # AS8866 -95.67.18.100:8333 # AS34867 -95.70.238.176:8333 # AS12735 -95.83.73.31:8333 # AS8359 -95.90.128.3:8333 # AS204028 -95.110.234.93:8333 # AS31034 -95.161.12.45:8333 # AS39598 -95.172.62.167:8333 # AS201826 -95.179.128.87:8333 # AS20473 -95.191.130.100:8333 # AS12389 -95.214.53.154:8333 # AS201814 -96.3.53.254:8333 # AS11232 -97.75.145.12:8333 # AS22709 -97.81.198.180:8333 # AS20115 -97.87.216.110:8333 # AS20115 -99.229.210.111:8333 # AS812 -99.246.87.2:8333 # AS812 -101.43.124.195:8333 # AS45090 -102.132.192.141:8333 # AS37680 -103.21.3.89:8333 # AS38195 -103.35.121.72:8333 # AS9498 -103.99.168.100:8333 # AS6939 -103.99.168.140:8333 # AS6939 -103.99.170.210:8333 # AS54415 -103.99.170.220:8333 # AS54415 -103.105.202.50:8333 # AS137764 -104.238.220.199:8333 # AS23470 -104.243.33.165:8333 # AS23470 -104.244.73.6:8333 # AS53667 -108.26.125.214:8333 # AS701 -109.86.60.33:8333 # AS13188 -109.99.63.159:8333 # AS9050 -109.120.194.136:8333 # AS34569 -109.123.233.138:8333 # AS15685 -109.123.240.53:8333 # AS15685 -109.153.94.35:8333 # AS2856 -109.173.126.157:8333 # AS42610 -109.193.76.200:8333 # AS51185 -109.221.229.197:8333 # AS3215 -109.236.90.117:8333 # AS49981 -109.248.206.13:8333 # AS203493 -111.90.140.23:8333 # AS45839 -111.90.140.46:8333 # AS45839 -111.90.145.37:8333 # AS18106 -114.173.159.209:8333 # AS4713 -116.58.171.67:8333 # AS2514 -119.31.179.202:8333 # AS17408 -119.42.55.203:8333 # AS133159 -122.222.160.190:8333 # AS2519 -123.60.213.192:8333 # AS55990 -124.197.54.113:8333 # AS9790 -125.168.140.108:8333 # AS4826 -128.0.190.26:8333 # AS30764 -128.65.194.136:8333 # AS29222 -129.13.189.212:8333 # AS34878 -129.13.189.215:8333 # AS34878 -129.226.216.148:8333 # AS132203 -131.188.40.191:8333 # AS680 -134.65.9.63:8333 # AS19653 -134.122.200.160:8333 # AS64050 -134.195.185.52:8333 # AS13536 -135.19.253.101:8333 # AS5769 -136.29.109.58:8333 # AS19165 -136.32.238.6:8333 # AS16591 -136.49.201.24:8333 # AS16591 -137.226.34.46:8333 # AS680 -138.207.211.189:8333 # AS11776 -139.130.41.82:8333 # AS1221 -140.238.220.99:8333 # AS31898 -142.54.181.218:8333 # AS32097 -142.166.19.23:8333 # AS855 -142.254.87.115:8333 # AS46375 -143.177.229.149:8333 # AS50266 -144.2.101.21:8333 # AS3303 -144.24.236.64:8333 # AS31898 -145.40.51.52:8333 # AS49808 -146.71.69.103:8333 # AS7782 -146.120.241.173:8333 # AS208515 -147.50.238.53:8333 # AS45265 -148.103.101.132:8333 # AS28118 -149.75.48.92:8333 # AS6079 -152.44.137.83:8333 # AS11404 -154.0.3.194:8333 # AS37680 -154.26.137.105:8333 # AS174 -154.26.154.73:8333 # AS1299 -154.57.5.11:8333 # AS200736 -155.4.55.21:8333 # AS8473 -156.146.137.142:8333 # AS1448 -156.146.177.221:8333 # AS1448 -157.22.72.175:8333 # AS397379 -157.97.0.118:8333 # AS43571 -158.140.141.69:8333 # AS132132 -158.181.132.84:8333 # AS41750 -159.2.215.98:8333 # AS855 -159.196.3.239:8333 # AS4764 -159.224.189.250:8333 # AS13188 -160.80.12.16:8333 # AS137 -161.230.38.160:8333 # AS12353 -161.246.11.230:8333 # AS9486 -162.0.210.152:8333 # AS22612 -162.62.18.226:8333 # AS132203 -162.254.118.20:8333 # AS6130 -163.158.168.181:8333 # AS15435 -165.173.19.33:8333 # AS132132 -165.228.174.117:8333 # AS1221 -165.255.241.184:8333 # AS327693 -167.88.11.203:8333 # AS20278 -167.179.147.155:8333 # AS4764 -170.17.151.235:8333 # AS3303 -170.64.174.230:8333 # AS15108 -172.92.102.115:8333 # AS11404 -172.105.21.216:8333 # AS63949 -172.111.176.244:8333 # AS46562 -172.255.98.108:8333 # AS7979 -173.82.5.202:8333 # AS35916 -173.181.35.50:8333 # AS395570 -173.212.253.137:8333 # AS51167 -173.235.73.87:8333 # AS11272 -174.30.29.85:8333 # AS209 -174.141.209.40:8333 # AS6461 -176.9.17.121:8333 # AS24940 -176.12.16.135:8333 # AS8717 -176.74.136.237:8333 # AS35613 -176.74.139.120:8333 # AS35613 -176.122.122.134:8333 # AS50581 -176.126.167.10:8333 # AS8449 -176.151.244.130:8333 # AS5410 -176.186.19.106:8333 # AS5410 -176.212.185.153:8333 # AS9049 -177.142.146.193:8333 # AS4230 -178.21.118.178:8333 # AS49544 -178.61.141.198:8333 # AS21050 -178.124.162.209:8333 # AS6697 -178.143.25.194:8333 # AS15962 -178.154.233.197:8333 # AS200350 -178.159.98.133:8333 # AS202390 -178.232.186.191:8333 # AS41164 -178.236.137.63:8333 # AS44843 -179.60.149.4:8333 # AS395839 -184.160.110.104:8333 # AS5769 -184.174.37.139:8333 # AS1239 -185.8.104.179:8333 # AS16125 -185.14.30.25:8333 # AS21100 -185.25.48.184:8333 # AS61272 -185.52.93.45:8333 # AS39449 -185.64.116.15:8333 # AS31736 -185.69.105.117:8333 # AS6855 -185.98.54.20:8333 # AS39572 -185.107.83.55:8333 # AS43350 -185.132.109.122:8333 # AS38919 -185.135.81.50:8333 # AS57494 -185.140.253.169:8333 # AS200735 -185.148.3.227:8333 # AS47605 -185.154.2.3:8333 # AS29119 -185.162.92.36:8333 # AS41722 -185.163.44.36:8333 # AS39798 -185.165.170.19:8333 # AS3223 -185.167.113.59:8333 # AS207054 -185.185.59.12:8333 # AS48614 -185.203.41.148:8333 # AS9009 -185.209.12.76:8333 # AS212323 -185.209.70.17:8333 # AS204568 -185.210.125.33:8333 # AS205671 -185.233.189.210:8333 # AS61303 -185.238.131.19:8333 # AS206238 -185.239.220.210:8333 # AS61282 -185.239.221.5:8333 # AS61282 -185.250.90.246:8333 # AS61955 -186.249.217.25:8333 # AS7195 -186.250.95.132:8333 # AS262967 -188.35.167.14:8333 # AS34123 -188.68.53.44:8333 # AS47147 -188.120.255.115:8333 # AS29182 -189.6.195.111:8333 # AS28573 -190.2.130.44:8333 # AS49981 -190.13.122.89:8333 # AS33576 -190.123.27.11:8333 # AS52468 -190.145.127.254:8333 # AS14080 -191.220.156.64:8333 # AS8167 -192.31.136.90:8333 # AS54098 -192.69.53.43:8333 # AS11142 -192.146.137.44:8333 # AS25376 -192.174.121.33:8333 # AS11492 -192.222.147.175:8333 # AS1403 -193.198.34.24:8333 # AS2108 -193.222.130.14:8333 # AS29208 -194.35.185.167:8333 # AS9063 -194.54.83.234:8333 # AS41018 -194.233.84.100:8333 # AS141995 -195.2.73.88:8333 # AS48282 -195.48.12.8:8333 # AS1836 -195.154.200.157:8333 # AS12876 -197.211.133.15:8333 # AS51265 -198.84.146.8:8333 # AS5645 -198.98.55.86:8333 # AS53667 -199.247.7.208:8333 # AS20473 -200.116.154.131:8333 # AS13489 -201.191.6.103:8333 # AS11830 -201.221.234.200:8333 # AS27928 -202.47.225.242:8333 # AS9931 -202.107.219.130:8333 # AS4134 -202.108.211.135:8333 # AS4837 -202.138.13.122:8333 # AS4826 -203.86.195.32:8333 # AS23655 -203.184.52.247:8333 # AS9790 -204.111.163.114:8333 # AS4922 -205.178.41.124:8333 # AS11039 -206.192.203.0:8333 # AS7029 -207.229.46.80:8333 # AS852 -207.244.248.81:8333 # AS40021 -207.255.193.47:8333 # AS11776 -208.59.133.63:8333 # AS11039 -209.58.145.157:8333 # AS394380 -209.97.189.249:8333 # AS14061 -209.177.138.245:8333 # AS7832 -209.237.133.54:8333 # AS53859 -210.54.37.190:8333 # AS4648 -210.54.39.238:8333 # AS4648 -212.34.225.118:8333 # AS44395 -212.41.9.30:8333 # AS49505 -212.51.132.176:8333 # AS13030 -212.69.60.77:8333 # AS12496 -212.86.32.106:8333 # AS15366 -213.47.64.105:8333 # AS8412 -213.141.154.201:8333 # AS12714 -213.142.148.169:8333 # AS6762 -213.184.244.24:8333 # AS60280 -213.227.147.244:8333 # AS60781 -213.250.21.112:8333 # AS5603 -216.146.251.8:8333 # AS54579 -216.232.157.104:8333 # AS395570 -217.15.178.11:8333 # AS25534 -217.26.32.10:8333 # AS197312 -217.64.47.200:8333 # AS39324 -217.76.51.25:8333 # AS39597 -217.92.55.246:8333 # AS3320 -217.170.124.170:8333 # AS35401 -217.180.221.162:8333 # AS30600 -217.180.238.137:8333 # AS30600 -220.84.232.46:8333 # AS4766 -220.133.39.61:8333 # AS3462 -220.233.91.182:8333 # AS38195 -[2001:19f0:1000:1db3:5400:4ff:fe56:5a8d]:8333 # AS20473 -[2001:19f0:5:24da:3eec:efff:feb9:f36e]:8333 # AS20473 -[2001:19f0:5:24da::]:8333 # AS20473 -[2001:19f0:5:4535:3eec:efff:feb9:87e4]:8333 # AS20473 -[2001:19f0:5:4535::]:8333 # AS20473 -[2001:1bc0:c1::2000]:8333 # AS29686 -[2001:1c04:4008:6300:8a5f:2678:114b:a660]:8333 # AS6830 -[2001:41d0:203:3739::]:8333 # AS16276 -[2001:41d0:203:8f49::]:8333 # AS16276 -[2001:41d0:203:bb0a::]:8333 # AS16276 -[2001:41d0:2:bf8f::]:8333 # AS16276 -[2001:41d0:303:de8b::]:8333 # AS16276 -[2001:41d0:403:3d61::]:8333 # AS16276 -[2001:41d0:405:9600::]:8333 # AS16276 -[2001:41d0:8:ed7f::1]:8333 # AS16276 -[2001:41d0:a:69a2::1]:8333 # AS16276 -[2001:41f0::62:6974:636f:696e]:8333 # AS6830 -[2001:470:1b62::]:8333 # AS6939 -[2001:470:1f05:43b:2831:8530:7179:5864]:8333 # AS6939 -[2001:470:1f09:b14::11]:8333 # AS6939 -[2001:470:1f15:106:e2d5:5eff:fe42:7ae5]:8333 # AS6939 -[2001:470:1f1b:365:aa20:66ff:fe3f:1909]:8333 # AS6939 -[2001:470:1f1b:5a6:216:3eff:fe24:1162]:8333 # AS6939 -[2001:470:6a7c::]:8333 # AS6939 -[2001:470:75e9:1::10]:8333 # AS6939 -[2001:470:8ca0:2:4e72:b9ff:fe56:f8b8]:8333 # AS6939 -[2001:470:dbc7:0:1010::100]:8333 # AS6939 -[2001:4ba0:cafe:14cc::1]:8333 # AS24961 -[2001:4ba0:ffff:24::1]:8333 # AS24961 -[2001:4dd0:3564:0:30b7:1d7b:6fec:4c5c]:8333 # AS8422 -[2001:4dd0:3564:0:88e:b4ff:2ad0:699b]:8333 # AS8422 -[2001:4dd0:3564:0:9c1c:cc31:9fe8:5505]:8333 # AS8422 -[2001:4dd0:3564:0:a0c4:d41f:4c4:1bb0]:8333 # AS8422 -[2001:4dd0:3564:1::7676:8090]:8333 # AS8422 -[2001:4dd0:3564:1:b977:bd71:4612:8e40]:8333 # AS8422 -[2001:4dd0:af0e:3564::69:1]:8333 # AS8422 -[2001:4dd0:af0e:3564::69:90]:8333 # AS8422 -[2001:560:441f:1::4]:8333 # AS18530 -[2001:638:a000:4140::ffff:191]:8333 # AS680 -[2001:67c:25dc:91::2]:8333 # AS41018 -[2001:67c:26b4:ff00::44]:8333 # AS25376 -[2001:67c:2db8:6::36]:8333 # AS39798 -[2001:7c0:2310:0:f816:3eff:fe6c:4f58]:8333 # AS34878 -[2001:861:3242:8420::40]:8333 # AS5410 -[2001:8b0:1301:1000::60]:8333 # AS20712 -[2001:b030:2422::208d]:8333 # AS3462 -[2001:b07:2ef:6e4a:3d:974e:784a:684b]:8333 # AS12874 -[2001:b07:5d32:b142:8f77:3c7d:a2fd:ed2e]:8333 # AS12874 -[2001:b07:6461:7811:489:d2da:e07:1af7]:8333 # AS12874 -[2001:b07:646b:8074:32e8:9243:a337:e60a]:8333 # AS12874 -[2001:b07:646b:8074:4cc6:79a5:3af7:7132]:8333 # AS12874 -[2001:b07:ad4:ca4b:7dd5:8471:50c3:5363]:8333 # AS12874 -[2001:bc8:1201:71a:2e59:e5ff:fe42:52f4]:8333 # AS12876 -[2001:bc8:1600:0:208:a2ff:fe0c:8a2e]:8333 # AS12876 -[2001:bc8:323c:ff:a634:384f:1849:f4bc]:8333 # AS12876 -[2001:bc8:323c:ff:d217:c2ff:fe07:2cd9]:8333 # AS12876 -[2001:bc8:700:2b14::1]:8333 # AS12876 -[2001:bc8:700:8d16::1]:8333 # AS12876 -[2001:e68:5400:58d0:bd15:ea8c:5b20:7523]:8333 # AS4788 -[2400:2411:a3e1:4900:7298:f550:67e7:b99b]:8333 # AS17676 -[2400:8901::f03c:93ff:fe2b:5c0b]:8333 # AS63949 -[2400:8901::f03c:93ff:fe5a:685c]:8333 # AS63949 -[2401:b140:1::100:210]:8333 # AS54415 -[2401:b140:1::100:220]:8333 # AS54415 -[2401:d002:3902:700:d72c:5e22:4e95:389d]:8333 # AS38195 -[2404:4408:63a4:a01::250]:8333 # AS9790 -[2406:3400:216:8b00:211:32ff:feca:336b]:8333 # AS10143 -[2406:8c00:0:3422:133:18:228:108]:8333 # AS24282 -[2406:da11:169:b03:32b5:f901:9f7c:3e4b]:8333 # AS16509 -[2406:da18:9f1:f301:7d2e:c256:c112:f2be]:8333 # AS16509 -[2406:da18:9f1:f303:c1c9:c569:b799:2057]:8333 # AS16509 -[2406:da1e:a4e:8a00:20db:dd8d:3670:28f0]:8333 # AS16509 -[2406:da1e:a4e:8a03:2aad:496b:768d:e497]:8333 # AS16509 -[2407:3640:2107:1278::1]:8333 # AS141995 -[2407:3640:3010:4012::1]:8333 # AS141995 -[2407:8800:bc61:2202:d63d:7eff:fe6c:dc36]:8333 # AS7545 -[2600:1700:5c5b:b0:aaa1:59ff:fe5f:615a]:8333 # AS7018 -[2600:1700:ec7b:5730::48]:8333 # AS7018 -[2600:1900:4000:4cc4:0:1::]:8333 # AS15169 -[2600:1900:4000:4cc4:0:2::]:8333 # AS15169 -[2600:1900:4000:4cc4:0:3::]:8333 # AS15169 -[2600:1900:4000:4cc4::]:8333 # AS15169 -[2600:1900:4030:a25e::]:8333 # AS15169 -[2600:1f14:40e:e301:afdd:ad00:e568:d220]:8333 # AS16509 -[2600:1f1c:2d3:2400:f15e:2f2a:760d:a33d]:8333 # AS16509 -[2600:2104:1003:c5ab:dc5e:90ff:fe18:1d08]:8333 # AS11404 -[2600:3c00::f03c:92ff:fe92:2745]:8333 # AS63949 -[2600:3c00::f03c:92ff:fecf:61b6]:8333 # AS63949 -[2600:3c00:e002:2e32::1:14]:8333 # AS63949 -[2600:3c01::f03c:93ff:fe2a:5266]:8333 # AS63949 -[2600:3c01::f03c:93ff:fe74:5f59]:8333 # AS63949 -[2600:3c01::f03c:93ff:fee6:2146]:8333 # AS63949 -[2600:3c02::f03c:92ff:fe5d:9fb]:8333 # AS63949 -[2600:4040:2004:3201:459f:8fe8:444d:baf1]:8333 # AS13786 -[2600:4040:4541:4900:4e1:b58a:8438:450e]:8333 # AS13786 -[2600:6c54:7100:1ad1:c92e:36d:651:bd18]:8333 # AS20115 -[2600:8801:2f80:477::141c]:8333 # AS22773 -[2600:8801:8d00:3eb0:20c:29ff:fec3:d799]:8333 # AS22773 -[2600:8805:2400:14e:12dd:b1ff:fef2:3013]:8333 # AS22773 -[2601:184:300:156c:ba4c:30:9da:6c06]:8333 # AS7922 -[2601:346:d7f:fff7:18c6:4856:ef75:744c]:8333 # AS7922 -[2601:405:4a00:876:c8d3:f081:2ce8:ba8e]:8333 # AS7922 -[2602:24c:b8f:cd90::7840]:8333 # AS46375 -[2602:fec3:0:1::69]:8333 # AS62563 -[2602:ff16:1:0:1:412:0:1]:8333 # AS29802 -[2603:3001:2618:c000:2ec1:df1f:a463:9119]:8333 # AS7922 -[2603:3003:11b:e100:20c:29ff:fe38:bbc0]:8333 # AS7922 -[2603:3004:6a1:3800:851f:584d:7aba:affb]:8333 # AS7922 -[2603:3004:6a1:3800::7bba]:8333 # AS7922 -[2603:3004:6a1:3800::f667]:8333 # AS7922 -[2603:3024:1606:1400::29ec]:8333 # AS7922 -[2603:3024:18ee:8000:20e:c4ff:fed1:ef15]:8333 # AS7922 -[2603:6000:a400:9300::2000]:8333 # AS7843 -[2603:6010:7001:4830::2:1]:8333 # AS7843 -[2603:8080:1f07:6fdd:7de2:d969:78c9:b7ea]:8333 # AS7843 -[2603:8080:d600:1800:7ce1:74a2:6a8a:4643]:8333 # AS7843 -[2603:8081:6c00:306e:215:5dff:fe02:150a]:8333 # AS7843 -[2604:3d09:7182:8700:bba9:cde6:5b37:a8df]:8333 # AS6327 -[2604:4080:1036:80b1::3be]:8333 # AS11404 -[2604:a00:3:1223:216:3eff:fe27:76e0]:8333 # AS19318 -[2604:a880:400:d0::261f:6001]:8333 # AS14061 -[2604:a880:4:1d0::13e:f000]:8333 # AS14061 -[2604:a880:4:1d0::17a:7000]:8333 # AS14061 -[2604:a880:4:1d0::c1:3000]:8333 # AS14061 -[2604:a880:4:1d0::e5:b000]:8333 # AS14061 -[2605:4a80:a302:7940:7254:1ed4:90d7:4f39]:8333 # AS11232 -[2605:4a80:a302:7940::2]:8333 # AS11232 -[2605:6400:30:f220::]:8333 # AS53667 -[2605:a140:3010:4014::1]:8333 # AS40021 -[2605:ae00:203::203]:8333 # AS7819 -[2605:b40:14d0:5b00:7988:eb8:6bb6:66e2]:8333 # AS174 -[2605:c000:2a0a:1::102]:8333 # AS7393 -[2607:5300:61:854::1]:8333 # AS16276 -[2607:9280:b:73b:250:56ff:fe14:25b5]:8333 # AS395502 -[2607:9280:b:73b:250:56ff:fe21:9c2f]:8333 # AS395502 -[2607:9280:b:73b:250:56ff:fe21:bf32]:8333 # AS395502 -[2607:9280:b:73b:250:56ff:fe33:4d1b]:8333 # AS395502 -[2607:9280:b:73b:250:56ff:fe3d:401]:8333 # AS395502 -[2620:6e:a000:1:42:42:42:42]:8333 # AS397444 -[2620:a6:2000:1:1:0:5:1601]:8333 # AS27566 -[2620:a6:2000:1:2:0:9:900b]:8333 # AS27566 -[2620:a6:2000:1:2:0:b:300e]:8333 # AS27566 -[2800:150:11d:d2f:bdac:7807:2f5:4aa0]:8333 # AS22047 -[2803:9800:a007:82ba:650b:82b8:8377:d0]:8333 # AS19037 -[2804:14c:155:45e0:1e86:15a3:efd9:7287]:8333 # AS28573 -[2804:14c:657d:4030:28b4:eff:fe9b:8894]:8333 # AS28573 -[2804:14d:1087:9434::1002]:8333 # AS4230 -[2804:954:24:2:b390:d83b:358a:db53]:8333 # AS263073 -[2804:d57:554d:de00:3e7c:3fff:fe7b:80aa]:8333 # AS8167 -[2a00:1028:838c:563a:fd25:87b6:5a54:811]:8333 # AS5610 -[2a00:1298:8001::6542]:8333 # AS5578 -[2a00:1398:4:2a03:215:5dff:fed6:1033]:8333 # AS34878 -[2a00:1398:4:2a03::bc03]:8333 # AS34878 -[2a00:1768:2001:27::ef6a]:8333 # AS43350 -[2a00:1f40:5001:108:5d17:7703:b0f5:4133]:8333 # AS42864 -[2a00:23c5:fe80:7301:d6ae:52ff:fed5:56a5]:8333 # AS2856 -[2a00:6020:13dc:bc00:5559:258:27d:b52b]:8333 # AS60294 -[2a00:6020:4503:3700:20c:29ff:fe61:4a4c]:8333 # AS60294 -[2a00:6020:b434:eb00:dea6:32ff:fe0d:a5c0]:8333 # AS60294 -[2a00:6020:b489:2000:5054:ff:fefc:5ed8]:8333 # AS60294 -[2a00:7c80:0:10c::2]:8333 # AS49981 -[2a00:7c80:0:25::e37a]:8333 # AS49981 -[2a00:8a60:e012:a00::21]:8333 # AS680 -[2a00:bbe0:cc:0:5a11:22ff:feb4:8f5c]:8333 # AS47605 -[2a00:bbe0:cc:0:62a4:4cff:fe23:7510]:8333 # AS47605 -[2a00:ca8:a15:9a5b:8b42:a886:7d48:7a21]:8333 # AS30764 -[2a00:ca8:a1f:f9b7:cb55:5766:524b:acaa]:8333 # AS30764 -[2a00:d4e0:ff:fc02:5e55:4a7c:b83b:e5a1]:8333 # AS15600 -[2a00:d520:9:9300:420b:544e:8019:6d3a]:8333 # AS15600 -[2a00:d880:5:c2::d329]:8333 # AS198203 -[2a00:ee2:1200:1900:8d3:d2ff:feb1:bc58]:8333 # AS5603 -[2a01:4f8:173:230a::2]:8333 # AS24940 -[2a01:4f8:200:7222::2]:8333 # AS24940 -[2a01:4f8:202:3e6::2]:8333 # AS24940 -[2a01:4f8:221:44d7::2]:8333 # AS24940 -[2a01:4f8:231:915::2]:8333 # AS24940 -[2a01:4f8:261:2bcd::2]:8333 # AS24940 -[2a01:4f8:261:3cae::2]:8333 # AS24940 -[2a01:4f8:261:420c::2]:8333 # AS24940 -[2a01:4f9:2b:29a::2]:8333 # AS24940 -[2a01:4f9:3a:2dd2::2]:8333 # AS24940 -[2a01:7a7:2:2804:ae1f:6bff:fe9d:6c94]:8333 # AS20773 -[2a01:7c8:aac2:180:5054:ff:fe56:8d10]:8333 # AS20857 -[2a01:7c8:aac9:c9:5054:ff:fedf:ff95]:8333 # AS20857 -[2a01:7e01::f03c:93ff:fe49:2f5b]:8333 # AS63949 -[2a01:8740:1:753::e5cb]:8333 # AS57344 -[2a01:8740:1:ffc5::8c6a]:8333 # AS57344 -[2a01:cb00:b63:c000:227:eff:fe28:c565]:8333 # AS3215 -[2a01:cb19:688:e900:aa60:b6ff:fe29:bbae]:8333 # AS3215 -[2a01:e0a:163:c0b0:9da5:1690:a12b:bede]:8333 # AS12322 -[2a01:e0a:282:67b0:b4f4:aaff:fe7c:44a6]:8333 # AS12322 -[2a01:e0a:301:7010:b87d:e14b:cea9:b998]:8333 # AS12322 -[2a01:e0a:320:39a0:325a:3aff:fe02:3180]:8333 # AS12322 -[2a01:e0a:351:9fb0:6bf2:95d6:b7bd:b846]:8333 # AS12322 -[2a01:e0a:5fa:a0a0:ca1f:66ff:fece:b8a2]:8333 # AS12322 -[2a01:e0a:83d:dd30:3676:5d8e:8a6f:115a]:8333 # AS12322 -[2a01:e0a:9e9:c240:7b44:f32a:6ec0:a8af]:8333 # AS12322 -[2a01:e0a:b5:7f50:c257:a55b:4846:97e1]:8333 # AS12322 -[2a01:e11:100c:70:cbc8:9e31:4b77:1626]:8333 # AS12322 -[2a02:1210:2cdf:4600:2bc:e03e:43e8:4718]:8333 # AS3303 -[2a02:1210:86bf:f100:a9ac:d041:1f8e:6925]:8333 # AS3303 -[2a02:1210:94c3:3400:d8c3:743c:90f6:a48a]:8333 # AS3303 -[2a02:168:2000:96::12]:8333 # AS13030 -[2a02:168:420b:a::20]:8333 # AS13030 -[2a02:168:676e:0:e65f:1ff:fe09:3591]:8333 # AS13030 -[2a02:1748:f39f:5872:216:3eff:fe21:266]:8333 # AS51184 -[2a02:180:1:1::517:10b6]:8333 # AS35366 -[2a02:2780:9000:70::7]:8333 # AS35434 -[2a02:2780:9000:70::f]:8333 # AS35434 -[2a02:2780::e01a]:8333 # AS35434 -[2a02:2f05:6008:ce00::1]:8333 # AS48571 -[2a02:390:9000:0:aaa1:59ff:fe43:b57b]:8333 # AS12496 -[2a02:578:85ce:1600:1e1b:dff:fee3:774b]:8333 # AS9031 -[2a02:768:f92b:db46:5e46:772b:71d:29b7]:8333 # AS44489 -[2a02:7a01::91:228:45:130]:8333 # AS16019 -[2a02:7b40:50d0:e386::1]:8333 # AS62282 -[2a02:7b40:50d1:e35b::1]:8333 # AS62282 -[2a02:7b40:5928:89::1]:8333 # AS62282 -[2a02:7b40:b945:344d::1]:8333 # AS62282 -[2a02:7b40:d418:6d9a::1]:8333 # AS62282 -[2a02:8070:b84:6ae0:f9c6:fbb9:1c41:81aa]:8333 # AS51185 -[2a02:8070:f186:38e0::d5a6]:8333 # AS51185 -[2a02:8084:103:6810:1e69:7aff:fea2:1acc]:8333 # AS6830 -[2a02:8308:8081:f300:3b8:7ec0:2837:1b57]:8333 # AS16019 -[2a02:8388:e302:7980:6f85:a0b3:4b4d:8b0f]:8333 # AS8412 -[2a02:8388:e5c3:4a80:201:2eff:fe82:b3cc]:8333 # AS8412 -[2a02:842a:1df:8a01:1e1b:dff:fe0b:236d]:8333 # AS15557 -[2a02:a210:28be:5f80::111]:8333 # AS6830 -[2a02:a44b:5cf9:1:b62e:99ff:fe49:d492]:8333 # AS1136 -[2a02:a44d:14d6:1:2c0:8ff:fe8f:b3b2]:8333 # AS1136 -[2a02:a45a:94cd:f00d::1]:8333 # AS1136 -[2a02:a45f:3b9d:31::199]:8333 # AS1136 -[2a02:a464:3d6b::1:2]:8333 # AS1136 -[2a02:a46c:7f8e:1:35bf:3aeb:137c:1d35]:8333 # AS1136 -[2a02:a46d:36f:1:20d:b9ff:fe4e:6398]:8333 # AS1136 -[2a02:c205:2021:4216::1]:8333 # AS51167 -[2a02:c206:2044:9826::1]:8333 # AS51167 -[2a02:c206:2075:3351::1]:8333 # AS51167 -[2a02:c207:0:3829::1]:8333 # AS51167 -[2a02:c207:2014:4199::1]:8333 # AS51167 -[2a02:c207:2014:8757::1]:8333 # AS51167 -[2a02:c207:2026:6682::1]:8333 # AS51167 -[2a02:c207:2034:7358::1]:8333 # AS51167 -[2a02:c207:3002:7468::1]:8333 # AS51167 -[2a02:c207:3008:4592::1]:8333 # AS51167 -[2a02:cb43:4000::178]:8333 # AS33891 -[2a02:e5e:1:10::27]:8333 # AS25057 -[2a02:e98:20:1504::1]:8333 # AS24641 -[2a03:4000:28:68:7411:53ff:fe4c:21d]:8333 # AS47147 -[2a03:4000:65:fdc:3462:66ff:fe05:ec5c]:8333 # AS47147 -[2a03:6000:870:0:46:23:87:218]:8333 # AS51088 -[2a03:94e0:ffff:185:243:218:0:19]:8333 # AS56655 -[2a03:b0c0:1:e0::397:6001]:8333 # AS14061 -[2a03:b0c0:1:e0::794:9001]:8333 # AS14061 -[2a03:b0c0:2:f0::288:c001]:8333 # AS14061 -[2a03:b0c0:2:f0::30c:1]:8333 # AS14061 -[2a03:b0c0:3:d0::e3b:5001]:8333 # AS14061 -[2a03:cfc0:8000:7::5fd6:3557]:8333 # AS201814 -[2a04:2180:dc05:2::3b]:8333 # AS61272 -[2a04:2180:ffff:fffe::d]:8333 # AS61272 -[2a04:52c0:103:c455::1]:8333 # AS60404 -[2a04:bc40:1dc3:8d::2:1001]:8333 # AS35277 -[2a05:3580:dc0b:1600:def4:5a62:de42:324a]:8333 # AS20764 -[2a05:d014:a55:4000:8dde:69f:4ac7:b26]:8333 # AS16509 -[2a05:d016:98f:5201:6be0:a4de:80c7:32d5]:8333 # AS16509 -[2a05:d018:a75:6c03:75b:2c73:8caa:414b]:8333 # AS16509 -[2a05:f480:1800:697:5400:2ff:feb6:c36d]:8333 # AS20473 -[2a06:e040:7603:2918:c6ef:464e:9fe5:73ec]:8333 # AS198507 -[2a07:abc4::89:234:180:194]:8333 # AS62000 -[2a07:d884::127e]:8333 # AS6762 -[2a09:2681:1010:10::5]:8333 # AS61282 -[2a09:2681:102::210]:8333 # AS61282 -[2a0b:f300:2:6::2]:8333 # AS62240 -[2a0d:8340:24::2]:8333 # AS50113 -[2a0e:8f02:21d1:144::101]:8333 # AS20473 -[2a0e:b780::55d1:f05b]:8333 # AS205581 -[2a10:3781:2c19::1]:8333 # AS206238 -[2a10:d200:1:33:a6bf:1ff:fe6a:46a9]:8333 # AS212323 -[2a12:8e40:5668:e40a::1]:8333 # AS34465 -[2a12:8e40:5668:e40b::1]:8333 # AS34465 -[2a12:8e40:5668:e40c::1]:8333 # AS34465 -[2a12:8e40:5668:e40d::1]:8333 # AS34465 -[2a12:8e40:5668:e40e::1]:8333 # AS34465 -[2a12:8e40:5668:e40f::1]:8333 # AS34465 -[2a12:8e40:5668:e410::1]:8333 # AS34465 -[2a12:8e40:5668:e411::1]:8333 # AS34465 -[2a12:8e40:5668:e412::1]:8333 # AS34465 -[2a12:8e40:5668:e417::1]:8333 # AS34465 -[2c0f:f8f0:da51:0:3a45:fc57:5e30:2593]:8333 # AS30844 - -# manually updated 2023-04 for minimal torv3 bootstrap support - -2bqghnldu6mcug4pikzprwhtjjnsyederctvci6klcwzepnjd46ikjyd.onion:8333 -4lr3w2iyyl5u5l6tosizclykf5v3smqroqdn2i4h3kq6pfbbjb2xytad.onion:8333 -5g72ppm3krkorsfopcm2bi7wlv4ohhs4u4mlseymasn7g7zhdcyjpfid.onion:8333 -5sbmcl4m5api5tqafi4gcckrn3y52sz5mskxf3t6iw4bp7erwiptrgqd.onion:8333 -776aegl7tfhg6oiqqy76jnwrwbvcytsx2qegcgh2mjqujll4376ohlid.onion:8333 -77mdte42srl42shdh2mhtjr7nf7dmedqrw6bkcdekhdvmnld6ojyyiad.onion:8333 -azbpsh4arqlm6442wfimy7qr65bmha2zhgjg7wbaji6vvaug53hur2qd.onion:8333 -b64xcbleqmwgq2u46bh4hegnlrzzvxntyzbmucn3zt7cssm7y4ubv3id.onion:8333 -bsqvncparrfihlwolt4xgjbf4cgqckvrvsfyvy6vhiqrnh4w6ghixoid.onion:8333 -bsqvnctulf2g4jtjsdfgl2ed7qs6zz5wqx27qnyiik7laockryvszqqd.onion:8333 -cwi3ekrwhig47dhhzfenr5hbvckj7fzaojygvazi2lucsenwbzwoyiqd.onion:8333 -devinvncmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion:8333 -devinvnctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion:8333 -devinvncyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion:8333 -dtql5vci4iaml4anmueftqr7bfgzqlauzfy4rc2tfgulldd3ekyijjyd.onion:8333 -emzyvnc25oddoa2prol2znpz2axnrg6k77xwgirmhv7igoiucddsxiad.onion:8333 -emzyvnc3ewh7zihpkdvuwlgxrhzcxy2p5fvjggp7ngjbxcytxvt4rjid.onion:8333 -emzyvnc454ewbviqnmgtgx3rgublsgkk23r4onbhidcv36wremue4kqd.onion:8333 -emzyvnc5bnpb2o6gh54oquiox54o4r7yn4a2wiiwzrjonlouaibm2zid.onion:8333 -fpz6r5ppsakkwypjcglz6gcnwt7ytfhxskkfhzu62tnylcknh3eq6pad.onion:8333 -hanvo3hzqbhcqm5vahhi5a3czxxdwc7vt56p5gr7bifcvelaqurv6iid.onion:8333 -hz7oqntvj4adrwtqappcgaxfribg5u4rvfkpwlo3xup5fcuyvylkxlqd.onion:8333 -ityrxhidvjnjnf6imzyuqqnkkwridjnebkbokx25so3suq3fzezmksid.onion:8333 -jto2jfbsxhb6yvhcrrjddrgbakte6tgsy3c3z3prss64gndgvovvosyd.onion:8333 -k7nb3r7hxi5exvr4xmvnilhfw6hei7sw4rwz2t6onh4py6wbora6tuyd.onion:8333 -kpgvmscirrdqpekbqjsvw5teanhatztpp2gl6eee4zkowvwfxwenqaid.onion:8333 -l7kw3vjs4cf5mnuejjgqcxrw6wwsjmabllq3h3amy4f5q33d6cgo2kyd.onion:8333 -m7cbpjolo662uel7rpaid46as2otcj44vvwg3gccodnvaeuwbm3anbyd.onion:8333 -mowb2qwpjgs2a6q3yj3xa7nxklfssul4w7ynonyycw3uyopfu3x6ujad.onion:8333 -mwmfluek4au6mxxpw6fy7sjhkm65bdfc7izc7lpz3trewfdghyrzsbid.onion:8333 -rfqmn3qe36uaptkxhdvi74p4hyrzhir6vhmzb2hqryxodig4gue2zbyd.onion:8333 -rsgwtnousfc7zyg4qsm3gvczjx7cihh2njyjbjl3qvcj3xg7wmvhddqd.onion:8333 -s2d52bbttuwcl3pdrwzhxpmhtxn3jg23havjqg5eygwhtiw6lgyelpqd.onion:8333 -upvthy74hgvgbqi6w3zd2mlchoi5tvvw7b5hpmmhcddd5fnnwrixneid.onion:8333 -who3qs4eqlqzoxhqqgan4mg54ua5uz3mk4lj33ag53ei4orvnznrjbad.onion:8333 -wizbit5555bsslwv4ctronnsgk5vh2w2pdx7v7eyuivlyuoteejk7lid.onion:8333 -yrmedr35tt4wqfnwgilltxh5bnukeukxjpgg3jzmmsyld5lgsn5amvyd.onion:8333 - -# manually updated 2023-04 for minimal i2p bootstrap support -255fhcp6ajvftnyo7bwz3an3t4a4brhopm3bamyh2iu5r3gnr2rq.b32.i2p:0 -27yrtht5b5bzom2w5ajb27najuqvuydtzb7bavlak25wkufec5mq.b32.i2p:0 -3gocb7wc4zvbmmebktet7gujccuux4ifk3kqilnxnj5wpdpqx2hq.b32.i2p:0 -4fcc23wt3hyjk3csfzcdyjz5pcwg5dzhdqgma6bch2qyiakcbboa.b32.i2p:0 -4osyqeknhx5qf3a73jeimexwclmt42cju6xdp7icja4ixxguu2hq.b32.i2p:0 -4umsi4nlmgyp4rckosg4vegd2ysljvid47zu7pqsollkaszcbpqq.b32.i2p:0 -6j2ezegd3e2e2x3o3pox335f5vxfthrrigkdrbgfbdjchm5h4awa.b32.i2p:0 -6n36ljyr55szci5ygidmxqer64qr24f4qmnymnbvgehz7qinxnla.b32.i2p:0 -72yjs6mvlby3ky6mgpvvlemmwq5pfcznrzd34jkhclgrishqdxva.b32.i2p:0 -a5qsnv3maw77mlmmzlcglu6twje6ttctd3fhpbfwcbpmewx6fczq.b32.i2p:0 -aovep2pco7v2k4rheofrgytbgk23eg22dczpsjqgqtxcqqvmxk6a.b32.i2p:0 -bitcoi656nll5hu6u7ddzrmzysdtwtnzcnrjd4rfdqbeey7dmn5a.b32.i2p:0 -brifkruhlkgrj65hffybrjrjqcgdgqs2r7siizb5b2232nruik3a.b32.i2p:0 -c4gfnttsuwqomiygupdqqqyy5y5emnk5c73hrfvatri67prd7vyq.b32.i2p:0 -day3hgxyrtwjslt54sikevbhxxs4qzo7d6vi72ipmscqtq3qmijq.b32.i2p:0 -du5kydummi23bjfp6bd7owsvrijgt7zhvxmz5h5f5spcioeoetwq.b32.i2p:0 -e55k6wu46rzp4pg5pk5npgbr3zz45bc3ihtzu2xcye5vwnzdy7pq.b32.i2p:0 -eciohu5nq7vsvwjjc52epskuk75d24iccgzmhbzrwonw6lx4gdva.b32.i2p:0 -ejlnngarmhqvune74ko7kk55xtgbz5i5ncs4vmnvjpy3l7y63xaa.b32.i2p:0 -fhzlp3xroabohnmjonu5iqazwhlbbwh5cpujvw2azcu3srqdceja.b32.i2p:0 -fx6np3oheacr3t7gluftrqo2qxldbbatgw4hepp7ulb4j5ry57ca.b32.i2p:0 -gehtac45oaghz54ypyopim64mql7oad2bqclla74l6tfeolzmodq.b32.i2p:0 -hhfi4yqkg2twqiwezrfksftjjofbyx3ojkmlnfmcwntgnrjjhkya.b32.i2p:0 -jz3s4eurm5vzjresf4mwo7oni4bk36daolwxh4iqtewakylgkxmq.b32.i2p:0 -liu75cvktv4icbctg72w7nxbk4eibt7wamizfdii4omz7gcke5vq.b32.i2p:0 -lrah7acdsgopybg43shadwwiv6igezaw64i6jb5muqdg7dmhj3la.b32.i2p:0 -lzuu6mjtu7vd55d2biphicihufipoa7vyym6xfnkmmlra3tiziia.b32.i2p:0 -m6bpynxkv2ktwxkg6p2gyudjfhdupb6kuzabeqdnckkdkf4kxjla.b32.i2p:0 -m6v454xd6p3bt5swujgmveklsp7lzbkqlqqfc2p36cjlwv5dbucq.b32.i2p:0 -mlgeizrroynuhpxbzeosajt5u4ddcvynxfmcbm6kwjpaufilxigq.b32.i2p:0 -o6t4fr5ayfadzieutstgwcllvwxeuzjlxmzsmpj3hpkvefhzfaea.b32.i2p:0 -ofubxr2ir7u2guzjwyrvujicivzmvinwa36nuzlrg7tnsmebal7a.b32.i2p:0 -oz2ia3flpm3du2tyusulrn7h7e2eo3juzkrmn34bvnrlcrugv7ia.b32.i2p:0 -pohfcrfc7prn4bvn4xstw6nt3e7hjmb7kuj4djtsfqsskwhmhnna.b32.i2p:0 -qd6jlsevsexww3wefpqs7iglxb3f63y4e6ydulfzrvwflpicmdqa.b32.i2p:0 -rfjkzdzv4cwpxo6hzuncicvuyui76wxqx3a23lynq72ktwqs7aja.b32.i2p:0 -rizfinyses2r3or4iubs5wx66gdy6mpf73w7uobfacm2l5cral3q.b32.i2p:0 -sedndhv5vpcgdmykyi5st4yqhdxl3hpdtglta4do435wupahhx6q.b32.i2p:0 -tugq6wa2ls2bv27pr2iy3da3k5ow3fzefbcvjcr22uc7w5vmevja.b32.i2p:0 -usztavbib756k5vqggzgkyswoj6mttihjvp3c2pa642t2mb4pvsa.b32.i2p:0 -vgu6llqbyjphml25umd5ztvyxrxuplz2g74fzbx75g3kkaetoyiq.b32.i2p:0 -wjrul5jwwb4vqdmkkrjbmly7osj6amecdpsac5xvaoqrti4nb3ha.b32.i2p:0 -wwbw7nqr3ahkqv62cuqfwgtneekvvpnuc4i4f6yo7tpoqjswvcwa.b32.i2p:0 -xfkarmvk43vfkfvhkehy7ioj2b6wtfdlezvmlakblz3q4r7mccfq.b32.i2p:0 -yc4xwin5ujenvcr6ynwkz7lnmmq3nmzxvfguele6ovqqpxgjvonq.b32.i2p:0 -zdoabsg7ugzothyawodjhq54nvlofa746rxfkxpnjzj6nukmha6a.b32.i2p:0 -zsxwyo6qcn3chqzwxnseusqgsnuw3maqnztkiypyfxtya4snkoka.b32.i2p:0 -zysrlpii5ftrzivfcyhdrwpeyyqddbrdefnfu5q6otk5gtugmh2a.b32.i2p:0 - -# manually updated 2023-04 for minimal cjdns bootstrap support -[fc32:17ea:e415:c3bf:9808:149d:b5a2:c9aa]:8333 -[fcc7:be49:ccd1:dc91:3125:f0da:457d:8ce]:8333 -[fcdc:73ae:b1a9:1bf8:d4c2:811:a4c7:c34e]:8333 +# List of node IP addresses for mainnet - currently empty for Vincoin network diff --git a/contrib/seeds/nodes_main_manual.txt b/contrib/seeds/nodes_main_manual.txt index 7de54c60241bb..79ca3b3fe9845 100644 --- a/contrib/seeds/nodes_main_manual.txt +++ b/contrib/seeds/nodes_main_manual.txt @@ -1,95 +1,2 @@ -# manually updated 2023-04 for minimal torv3 bootstrap support - -2bqghnldu6mcug4pikzprwhtjjnsyederctvci6klcwzepnjd46ikjyd.onion:8333 -4lr3w2iyyl5u5l6tosizclykf5v3smqroqdn2i4h3kq6pfbbjb2xytad.onion:8333 -5g72ppm3krkorsfopcm2bi7wlv4ohhs4u4mlseymasn7g7zhdcyjpfid.onion:8333 -5sbmcl4m5api5tqafi4gcckrn3y52sz5mskxf3t6iw4bp7erwiptrgqd.onion:8333 -776aegl7tfhg6oiqqy76jnwrwbvcytsx2qegcgh2mjqujll4376ohlid.onion:8333 -77mdte42srl42shdh2mhtjr7nf7dmedqrw6bkcdekhdvmnld6ojyyiad.onion:8333 -azbpsh4arqlm6442wfimy7qr65bmha2zhgjg7wbaji6vvaug53hur2qd.onion:8333 -b64xcbleqmwgq2u46bh4hegnlrzzvxntyzbmucn3zt7cssm7y4ubv3id.onion:8333 -bsqvncparrfihlwolt4xgjbf4cgqckvrvsfyvy6vhiqrnh4w6ghixoid.onion:8333 -bsqvnctulf2g4jtjsdfgl2ed7qs6zz5wqx27qnyiik7laockryvszqqd.onion:8333 -cwi3ekrwhig47dhhzfenr5hbvckj7fzaojygvazi2lucsenwbzwoyiqd.onion:8333 -devinvncmwkuitvxl3tfi5of4zau46ymeannkjv6fpnylkgf3q5fa3id.onion:8333 -devinvnctu7uctl7hly2juu3thbgeivfnvw3ckj3phy6nyvpnx66yeyd.onion:8333 -devinvncyk643iruzfpaxw3on2jket7rbjmwygm42dmdyub3ietrbmid.onion:8333 -dtql5vci4iaml4anmueftqr7bfgzqlauzfy4rc2tfgulldd3ekyijjyd.onion:8333 -emzyvnc25oddoa2prol2znpz2axnrg6k77xwgirmhv7igoiucddsxiad.onion:8333 -emzyvnc3ewh7zihpkdvuwlgxrhzcxy2p5fvjggp7ngjbxcytxvt4rjid.onion:8333 -emzyvnc454ewbviqnmgtgx3rgublsgkk23r4onbhidcv36wremue4kqd.onion:8333 -emzyvnc5bnpb2o6gh54oquiox54o4r7yn4a2wiiwzrjonlouaibm2zid.onion:8333 -fpz6r5ppsakkwypjcglz6gcnwt7ytfhxskkfhzu62tnylcknh3eq6pad.onion:8333 -hanvo3hzqbhcqm5vahhi5a3czxxdwc7vt56p5gr7bifcvelaqurv6iid.onion:8333 -hz7oqntvj4adrwtqappcgaxfribg5u4rvfkpwlo3xup5fcuyvylkxlqd.onion:8333 -ityrxhidvjnjnf6imzyuqqnkkwridjnebkbokx25so3suq3fzezmksid.onion:8333 -jto2jfbsxhb6yvhcrrjddrgbakte6tgsy3c3z3prss64gndgvovvosyd.onion:8333 -k7nb3r7hxi5exvr4xmvnilhfw6hei7sw4rwz2t6onh4py6wbora6tuyd.onion:8333 -kpgvmscirrdqpekbqjsvw5teanhatztpp2gl6eee4zkowvwfxwenqaid.onion:8333 -l7kw3vjs4cf5mnuejjgqcxrw6wwsjmabllq3h3amy4f5q33d6cgo2kyd.onion:8333 -m7cbpjolo662uel7rpaid46as2otcj44vvwg3gccodnvaeuwbm3anbyd.onion:8333 -mowb2qwpjgs2a6q3yj3xa7nxklfssul4w7ynonyycw3uyopfu3x6ujad.onion:8333 -mwmfluek4au6mxxpw6fy7sjhkm65bdfc7izc7lpz3trewfdghyrzsbid.onion:8333 -rfqmn3qe36uaptkxhdvi74p4hyrzhir6vhmzb2hqryxodig4gue2zbyd.onion:8333 -rsgwtnousfc7zyg4qsm3gvczjx7cihh2njyjbjl3qvcj3xg7wmvhddqd.onion:8333 -s2d52bbttuwcl3pdrwzhxpmhtxn3jg23havjqg5eygwhtiw6lgyelpqd.onion:8333 -upvthy74hgvgbqi6w3zd2mlchoi5tvvw7b5hpmmhcddd5fnnwrixneid.onion:8333 -who3qs4eqlqzoxhqqgan4mg54ua5uz3mk4lj33ag53ei4orvnznrjbad.onion:8333 -wizbit5555bsslwv4ctronnsgk5vh2w2pdx7v7eyuivlyuoteejk7lid.onion:8333 -yrmedr35tt4wqfnwgilltxh5bnukeukxjpgg3jzmmsyld5lgsn5amvyd.onion:8333 - -# manually updated 2023-04 for minimal i2p bootstrap support -255fhcp6ajvftnyo7bwz3an3t4a4brhopm3bamyh2iu5r3gnr2rq.b32.i2p:0 -27yrtht5b5bzom2w5ajb27najuqvuydtzb7bavlak25wkufec5mq.b32.i2p:0 -3gocb7wc4zvbmmebktet7gujccuux4ifk3kqilnxnj5wpdpqx2hq.b32.i2p:0 -4fcc23wt3hyjk3csfzcdyjz5pcwg5dzhdqgma6bch2qyiakcbboa.b32.i2p:0 -4osyqeknhx5qf3a73jeimexwclmt42cju6xdp7icja4ixxguu2hq.b32.i2p:0 -4umsi4nlmgyp4rckosg4vegd2ysljvid47zu7pqsollkaszcbpqq.b32.i2p:0 -6j2ezegd3e2e2x3o3pox335f5vxfthrrigkdrbgfbdjchm5h4awa.b32.i2p:0 -6n36ljyr55szci5ygidmxqer64qr24f4qmnymnbvgehz7qinxnla.b32.i2p:0 -72yjs6mvlby3ky6mgpvvlemmwq5pfcznrzd34jkhclgrishqdxva.b32.i2p:0 -a5qsnv3maw77mlmmzlcglu6twje6ttctd3fhpbfwcbpmewx6fczq.b32.i2p:0 -aovep2pco7v2k4rheofrgytbgk23eg22dczpsjqgqtxcqqvmxk6a.b32.i2p:0 -bitcoi656nll5hu6u7ddzrmzysdtwtnzcnrjd4rfdqbeey7dmn5a.b32.i2p:0 -brifkruhlkgrj65hffybrjrjqcgdgqs2r7siizb5b2232nruik3a.b32.i2p:0 -c4gfnttsuwqomiygupdqqqyy5y5emnk5c73hrfvatri67prd7vyq.b32.i2p:0 -day3hgxyrtwjslt54sikevbhxxs4qzo7d6vi72ipmscqtq3qmijq.b32.i2p:0 -du5kydummi23bjfp6bd7owsvrijgt7zhvxmz5h5f5spcioeoetwq.b32.i2p:0 -e55k6wu46rzp4pg5pk5npgbr3zz45bc3ihtzu2xcye5vwnzdy7pq.b32.i2p:0 -eciohu5nq7vsvwjjc52epskuk75d24iccgzmhbzrwonw6lx4gdva.b32.i2p:0 -ejlnngarmhqvune74ko7kk55xtgbz5i5ncs4vmnvjpy3l7y63xaa.b32.i2p:0 -fhzlp3xroabohnmjonu5iqazwhlbbwh5cpujvw2azcu3srqdceja.b32.i2p:0 -fx6np3oheacr3t7gluftrqo2qxldbbatgw4hepp7ulb4j5ry57ca.b32.i2p:0 -gehtac45oaghz54ypyopim64mql7oad2bqclla74l6tfeolzmodq.b32.i2p:0 -hhfi4yqkg2twqiwezrfksftjjofbyx3ojkmlnfmcwntgnrjjhkya.b32.i2p:0 -jz3s4eurm5vzjresf4mwo7oni4bk36daolwxh4iqtewakylgkxmq.b32.i2p:0 -liu75cvktv4icbctg72w7nxbk4eibt7wamizfdii4omz7gcke5vq.b32.i2p:0 -lrah7acdsgopybg43shadwwiv6igezaw64i6jb5muqdg7dmhj3la.b32.i2p:0 -lzuu6mjtu7vd55d2biphicihufipoa7vyym6xfnkmmlra3tiziia.b32.i2p:0 -m6bpynxkv2ktwxkg6p2gyudjfhdupb6kuzabeqdnckkdkf4kxjla.b32.i2p:0 -m6v454xd6p3bt5swujgmveklsp7lzbkqlqqfc2p36cjlwv5dbucq.b32.i2p:0 -mlgeizrroynuhpxbzeosajt5u4ddcvynxfmcbm6kwjpaufilxigq.b32.i2p:0 -o6t4fr5ayfadzieutstgwcllvwxeuzjlxmzsmpj3hpkvefhzfaea.b32.i2p:0 -ofubxr2ir7u2guzjwyrvujicivzmvinwa36nuzlrg7tnsmebal7a.b32.i2p:0 -oz2ia3flpm3du2tyusulrn7h7e2eo3juzkrmn34bvnrlcrugv7ia.b32.i2p:0 -pohfcrfc7prn4bvn4xstw6nt3e7hjmb7kuj4djtsfqsskwhmhnna.b32.i2p:0 -qd6jlsevsexww3wefpqs7iglxb3f63y4e6ydulfzrvwflpicmdqa.b32.i2p:0 -rfjkzdzv4cwpxo6hzuncicvuyui76wxqx3a23lynq72ktwqs7aja.b32.i2p:0 -rizfinyses2r3or4iubs5wx66gdy6mpf73w7uobfacm2l5cral3q.b32.i2p:0 -sedndhv5vpcgdmykyi5st4yqhdxl3hpdtglta4do435wupahhx6q.b32.i2p:0 -tugq6wa2ls2bv27pr2iy3da3k5ow3fzefbcvjcr22uc7w5vmevja.b32.i2p:0 -usztavbib756k5vqggzgkyswoj6mttihjvp3c2pa642t2mb4pvsa.b32.i2p:0 -vgu6llqbyjphml25umd5ztvyxrxuplz2g74fzbx75g3kkaetoyiq.b32.i2p:0 -wjrul5jwwb4vqdmkkrjbmly7osj6amecdpsac5xvaoqrti4nb3ha.b32.i2p:0 -wwbw7nqr3ahkqv62cuqfwgtneekvvpnuc4i4f6yo7tpoqjswvcwa.b32.i2p:0 -xfkarmvk43vfkfvhkehy7ioj2b6wtfdlezvmlakblz3q4r7mccfq.b32.i2p:0 -yc4xwin5ujenvcr6ynwkz7lnmmq3nmzxvfguele6ovqqpxgjvonq.b32.i2p:0 -zdoabsg7ugzothyawodjhq54nvlofa746rxfkxpnjzj6nukmha6a.b32.i2p:0 -zsxwyo6qcn3chqzwxnseusqgsnuw3maqnztkiypyfxtya4snkoka.b32.i2p:0 -zysrlpii5ftrzivfcyhdrwpeyyqddbrdefnfu5q6otk5gtugmh2a.b32.i2p:0 - -# manually updated 2023-04 for minimal cjdns bootstrap support -[fc32:17ea:e415:c3bf:9808:149d:b5a2:c9aa]:8333 -[fcc7:be49:ccd1:dc91:3125:f0da:457d:8ce]:8333 -[fcdc:73ae:b1a9:1bf8:d4c2:811:a4c7:c34e]:8333 +# List of node IP addresses for mainnet - currently empty for Vincoin network diff --git a/contrib/seeds/nodes_test.txt b/contrib/seeds/nodes_test.txt index 5b04791d6038b..482da6f939231 100644 --- a/contrib/seeds/nodes_test.txt +++ b/contrib/seeds/nodes_test.txt @@ -1,89 +1,2 @@ -# List of fixed seed nodes for testnet +# List of fixed seed nodes for testnet - currently empty for Vincoin -# Onion nodes, last verified 2022-08 for minimal torv3 bootstrap support -24j74ahq6ed4wmfrghdwroyfzimlkhnrb7zh4zw3vl2allzxbjrhaqid.onion:18333 -2fy74te65gm3c3gv3u5mhwdudvbdfh6k5fdz4gduimrltjjrxftbxrqd.onion:18333 -2lsncqdflwk272dhydrxf7ikfy23ppnmm54dnynyxiym6lqf3wowrmqd.onion:18333 -33o6qaidta7s2pmltet6vynd337vamgcifhh44rehwwxqpflcjt2njid.onion:18333 -3oo6bsc5mvf6a6ypmoaikilta6ka7mbdhdwhrnqhuhjlbaxyedvfvaqd.onion:18333 -3pe3fyklipy4sppkkgnhc22kcxtt57uler5kv72t676bbrwmcseo5qad.onion:18333 -4u4mcz2sfvxs7pwcwncswgmmcdzqtzjx7ztfo332jv4pqucb22ikdhad.onion:18333 -5v3i2kfqiqwp75gznjoptss7qgrcgseceqxpzpqkd34qeqzrg726i7id.onion:18333 -5zlrxk6q24t4vz5k4ie7gtuasdjavhoelhinzimxbfhc77u7vafipsid.onion:18333 -67s3af64ehw7xnxv422axm7tns4d6kutrftc6bjq375n74q3kj4pp7ad.onion:18333 -6a4ony53julvnufo632ktgmwvhupz63wbdwx7n7qudjy32qyq6gm3bqd.onion:18333 -6ftyg3nhc6tn2hyzls6zfdsfbroczhkxtdqumqb5q4yafhy5rdpapbid.onion:18333 -7554uw5djruh34j5ddx3iprzgqgzypcjtptwoldymfbgoywqcw2wiwyd.onion:18333 -766lozlabxaqjpbqsvt6sn3c65n6gkwwhoxyvggj7nfwnmw4cpaoccad.onion:18333 -7blv5abnytdf47yvbhxmykprmvjryqob65i2jmdwq3rrajcn2iiysbqd.onion:18333 -7v2ja4igx4v5y2jr6jrr6gaxohjhlzhvgwe4avlraxchozf7ea3kruqd.onion:18333 -7zgbmtzxow2oevd5aaqtsormw7ujv4zprl3oi2355immhq4gk7cyw5ad.onion:18333 -adstabjz7ec2y3jt4w2dvummowzv7g6m2f3kajeejffuaz7ojwj6epqd.onion:18333 -aesy6tfufadkut6flu2bsqgnw2422ur2ynjalguxlzuzuktg3zehttqd.onion:18333 -alxo32b5edi3bn2e224qrgytgxxpic4knyipvpdvctfsrvcaiq5lgeyd.onion:18333 -aoeart34umoonvd2kbqr3bc4sweu6a4msh2gp4skyqvei3shzcxbgmyd.onion:18333 -aprzvj7hgctsde4mkj3ewq35gvykspjvkqiygg7bpnw5tkvse2n7rhid.onion:18333 -awpk6z3xghx6ozouhodcydaqtr6uzzbnw4creuix7mkupxoxlmhhspad.onion:18333 -ayynqazucyh2jd5rehcfggmhunqpdwzlbhzbqgy6lj4ctz2ocj7chpid.onion:18333 -b2ika53aqckv4gs7wmog3byrea2vfzm5p7ye33digcsmvvnpbyqmzoyd.onion:18333 -be7zx3hh6dlahorlvsrrgqm4oahfrgqm2tbwnbd4u53ntu5f765n6hyd.onion:18333 -bluk62wj24bsvdwh47muo54hhwsatkftiqxevt5kba7hstjoex6ueeyd.onion:18333 -bubm6fiopfzkxqrfx6vqpioe5ahlhyubz57ogsqqy4ha5pnngiqlh6id.onion:18333 -d3czabzjj57lgrsr5gawkjd7v3gznrqa7zyizqmk4lryascavmipnyad.onion:18333 -ddj4cuvb32ve5chtp6jattcdnnmxmpoofjthzi7thgxxht7yqoetj3yd.onion:18333 -dqhhlssfwmh3g6zhwxpcfbw64xz5rfikcglinbhoxv5ajv4qzicjyeid.onion:18333 -drthcyb4x4rdfekw5g7xjogxi7aqoluilgulbgwvsme3nw3oibvchbad.onion:18333 -dwb47cmqa2tjpmvjaear7gdcars2lez6niefhi4qf22qehtyta6577qd.onion:18333 -e7tkrf54ng3q5vcn5gn77zwjwm74lkfav4mwdux3pvon6yvqg3tf46qd.onion:18333 -etuymy47s3quepvdaoo72i5e5mc7uovrzu5m4jf5q6mwlwizoxy4xgid.onion:18333 -fbimesnyhzubbzqc3uaufzkbyfmnkxvypoxaveaub7rzpzh2foxrn2yd.onion:18333 -fzbrwmgwmko7quelrhfuskt3ijabac76zx7g52dfrevmhdkj6ivh7qyd.onion:18333 -gy6nih4pmp5esyvvnhlj6qvk7zkbjuoswkxffyiip3dbkvsfxwz5zcqd.onion:18333 -ha62ziqzqdogd75zg7lfh4fqrg3bim3cpqzyupo43w5pw4fen6nr2pyd.onion:18333 -hacjjgj2mbqqrthzimmi6anvin7dljjhfl3ik6ebg3w3nmgsvr3ymmqd.onion:18333 -hbkp5xwpqo4qm75kpglfrclyiuuvdgv7mtiqfys7oqks4dmpqgpeoeid.onion:18333 -hqgoy62hoqjmz37brdfvoeov3cix5fixbqjoert4ydr6herg5oc3iwyd.onion:18333 -hvbmmzvqrpgps2x5u4ip4ksf3e5m2fneac754gtnhjn2rsevni6cz3ad.onion:18333 -hw3vzp32w4h6giplue6ix445oi6wt7gmeksrznb7tdfwhkgit7gnbbad.onion:18333 -iddr66ewkhenivapgianudjkwqcp6dxtssg7ixrdot5az6uh7m5tmjqd.onion:18333 -imya36iexiiiqrkwuxxcehnv4kg5shtirwd2vg4cnjy6lfjlph3fusqd.onion:18333 -iuhhuocns7entrzlxsxktyz2ibs7hqgiggv6sauzqkzka6laslwz7oqd.onion:18333 -ji5wmshokuc63eiulzlwj2zdvnligvrwfvvc76bice3tu43wfzvpmkyd.onion:18333 -jjfuyj7krgzkmpxvn3b2j2hwlzkmze3ezy3ifwk7dnswwawgmzqhjrqd.onion:18333 -jn2p4sgfphkxpow7kjrubrbqat77kkibzqkvuwhxyalcrazwmcqeaqyd.onion:18333 -jrveyz4us6sog6e6czsvr5mvvhgzjgv4idbe4idrolmqeudvt5a2dgid.onion:18333 -jsc4frvvnl2d3bhzyofsc72xpztgm23nl4fnb4dwkzsxr6fhij2q5iyd.onion:18333 -klymxdvje7kccv3tznabo3udopsftkmjemkbi2urqxjm4hefaudejjyd.onion:18333 -kwjxlauwjtecjfsiwopbl5pvn5n6z5rz76uk6osmlurd3uyuymcw7aid.onion:18333 -lc7upz2srw2yhpcvwg4afy64ylcoo6mfwlttqj5ovuglqnhnohpi5iqd.onion:18333 -lf3mpxfyjuovcqdvinl52pvdmmda6xqyfeiarlfamdjpgy3ouzmmlbyd.onion:18333 -mc7k47ndjvvhcgs54wmjzxvate4rtuybbjoryikdssjhcxlx27psbyqd.onion:18333 -mjbg3ggeuelmc7ixty3zjccyo2urg2uyherfqe7ytkm2ejkwlec7h6ad.onion:18333 -nkyqozv6kdwi423s7s2mezzguf5bafot2a3hv4ed2dbvtblisdmad4qd.onion:18333 -nvvqo4xxiwgb3y246jmcbuuveurfdq2zs3a5y7veqkeqv5jfhang7gyd.onion:18333 -o6vfovqxz3oxszfppczpjejwouobztjrgvfojc3emvhan3bkyskzhuad.onion:18333 -oaiw2lnhzgp5ry7ivzneuufmh7lfploquu2rjv5rozmlbefedsnxe5qd.onion:18333 -oln7ybci53wk4g5n42nipyixvyjxbludsbrfsmhnirb6tk7ovlikd5id.onion:18333 -otmfnhc6wrrbf2tpdy6zkisqc3r3urnsuowsnmatoto6yixaocnkseid.onion:18333 -ovc6sajbqfcbwv3wrq7ylklu6q6prvisz4jr4lyycn4kgukzjfe4mjad.onion:18333 -pm57didyzg5ljuvn5ufr5uun2iencuk3af2gzqc5zvgfh452c3rxtjyd.onion:18333 -pmismhpwug34gnqzbutranvx2wjwbshyqj4un2dyzyuvak2eh55psfyd.onion:18333 -polarisultijjhaku6z6u7jyboho5epdsg44ttebfaxmgau2z5sqolad.onion:18333 -qe2jbe447he6panfvpyqhyntf7346gmuf55bxrmdzggmgwyjsyknhxyd.onion:18333 -qz6yd5lsgdajcteoareeptwnipxsezyx5kks6ukpk5tvqinffzunqmyd.onion:18333 -rp6pn3b3oesyr2giolbysbjhqeugxntsu7crnkth4y33ok4zvcl7yrqd.onion:18333 -ujdchuw3hz5gkbouiv4p6pwbfdn7v4k6gluwvd4wiukqc7y7ow754uad.onion:18333 -vctlwaqgmu53eutz2hewuakcipfgtyljsd7czut4dd62xr3rp6fqezad.onion:18333 -vf5ur53tzmdtotvkndcgochklnuav7quqjvkc6mctqfvef6wnmn26mid.onion:18333 -wnxgjgjgplv5iu4mssyuunycvku4qnqr5t4q6cfdt47k7uwrfifuirad.onion:18333 -wpkbkdr7clw7zk3jkwiult6bf422j54u77ml4rgig2xq7icogyrcspid.onion:18333 -wzpdt24tdark26eugredddorik3tqwcj5ialtt2yim4ceiuiq7phkyqd.onion:18333 -xgapnikkbldoggjh5ewxkyauhuwnvf3xkspxroe3ojvfrk4lswkyx5yd.onion:18333 -xkvzdhcirontixbq6pjhru57bf4sgtqylvphk25csfrsy5p5ay3oc3yd.onion:18333 -xnipauenw5wnjb2zbx6v6umgvbb3g6xhf5kjo7pnyn5tdzvzaxtzicid.onion:18333 -yda7kwpii33j2qpq32ftf6lp22znknswipjwaccvsqj7l337jvfesnid.onion:18333 -z3j5foswuhpmtrg3kb56stkzmuoaesvd5jz3eztq46c4cidapglcyuad.onion:18333 -zcep44k7unwjm2wxty4ijh2e4fv5zgbrvwlctzyaqnrqhltjfzrtodad.onion:18333 -zmvizz7fd5hdue6wt3lwqumd6qwt4ijymmmotfzh75curq3mzjm53hyd.onion:18333 -zoaa3x7quyuijggii5zl4uyeioodudsgtr2uyv2qtdsslac5ukiwlxid.onion:18333 -zovauxlorl5eswumbsoxv2m5y3sm3qlk7657dcpr2uld7xf35en46sqd.onion:18333 diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 36120f7ea48e1..eefb7c691e1e0 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -126,21 +126,6 @@ class CMainParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f")); assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); - // Note that of those which support the service bits prefix, most only support a subset of - // possible options. - // This is fine at runtime as we'll fall back to using them as an addrfetch if they don't support the - // service bits we want, but we should get them updated to support all service bits wanted by any - // release ASAP to avoid it where possible. - vSeeds.emplace_back("seed.vincoin.sipa.be."); // Pieter Wuille, only supports x1, x5, x9, and xd - vSeeds.emplace_back("dnsseed.bluematt.me."); // Matt Corallo, only supports x9 - vSeeds.emplace_back("dnsseed.vincoin.dashjr.org."); // Luke Dashjr - vSeeds.emplace_back("seed.vincoinstats.com."); // Christian Decker, supports x1 - xf - vSeeds.emplace_back("seed.vincoin.jonasschnelli.ch."); // Jonas Schnelli, only supports x1, x5, x9, and xd - vSeeds.emplace_back("seed.vnc.petertodd.net."); // Peter Todd, only supports x1, x5, x9, and xd - vSeeds.emplace_back("seed.vincoin.sprovoost.nl."); // Sjors Provoost - vSeeds.emplace_back("dnsseed.emzy.de."); // Stephan Oeste - vSeeds.emplace_back("seed.vincoin.wiz.biz."); // Jason Maurice - base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,0); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,5); base58Prefixes[SECRET_KEY] = std::vector(1,128); @@ -149,8 +134,6 @@ class CMainParams : public CChainParams { bech32_hrp = "bc"; - vFixedSeeds = std::vector(std::begin(chainparams_seed_main), std::end(chainparams_seed_main)); - fDefaultConsistencyChecks = false; m_is_mockable_chain = false; @@ -239,13 +222,10 @@ class CTestNetParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0x000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943")); assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); + // currently both vectors - vFixedSeeds and vSeeds are empty by default + // leave the call to the clear() function because it does not affect the state vFixedSeeds.clear(); vSeeds.clear(); - // nodes with support for servicebits filtering should be at the top - vSeeds.emplace_back("testnet-seed.vincoin.jonasschnelli.ch."); - vSeeds.emplace_back("seed.tvnc.petertodd.net."); - vSeeds.emplace_back("seed.testnet.vincoin.sprovoost.nl."); - vSeeds.emplace_back("testnet-seed.bluematt.me."); // Just a static list of stable node(s), only supports x9 base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,111); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,196); @@ -255,8 +235,6 @@ class CTestNetParams : public CChainParams { bech32_hrp = "tb"; - vFixedSeeds = std::vector(std::begin(chainparams_seed_test), std::end(chainparams_seed_test)); - fDefaultConsistencyChecks = false; m_is_mockable_chain = false; @@ -296,11 +274,6 @@ class SigNetParams : public CChainParams { if (!options.challenge) { bin = ParseHex("512103ad5e0edad18cb1f0fc0d28a3d4f1f3e445640337489abb10404f2d1e086be430210359ef5021964fe22d6f8e05b2463c9540ce96883fe3b278760f048f5189f2e6c452ae"); - vSeeds.emplace_back("seed.signet.vincoin.sprovoost.nl."); - - // Hardcoded nodes can be removed once there are more DNS seeds - vSeeds.emplace_back("178.128.221.177"); - vSeeds.emplace_back("v7ajjeirttkbnt32wpy3c6w3emwnfr3fkla7hpxcfokr3ysd3kqtzmqd.onion:36333"); consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000001ad46be4862"); consensus.defaultAssumeValid = uint256S("0x0000013d778ba3f914530f11f6b69869c9fab54acff85acd7b8201d111f19b7f"); // 150000 @@ -326,10 +299,6 @@ class SigNetParams : public CChainParams { LogPrintf("Signet with challenge %s\n", HexStr(bin)); } - if (options.seeds) { - vSeeds = *options.seeds; - } - m_chain_type = ChainType::SIGNET; consensus.signet_blocks = true; consensus.signet_challenge.assign(bin.begin(), bin.end()); @@ -373,6 +342,8 @@ class SigNetParams : public CChainParams { assert(consensus.hashGenesisBlock == uint256S("0x00000008819873e925422c1ff0f99f7cc9bbb232af63a077a480a3633bee1ef6")); assert(genesis.hashMerkleRoot == uint256S("0x4a5e1e4baab89f3a32518a88c31bc87f618f76673e2cc77ab2127b7afdeda33b")); + // currently vector vFixedSeeds is empty by default + // leave the call to the clear() function because it does not affect the state vFixedSeeds.clear(); m_assumeutxo_data = { diff --git a/src/kernel/chainparams.h b/src/kernel/chainparams.h index 46fc20735c1f2..14d5fc86282a8 100644 --- a/src/kernel/chainparams.h +++ b/src/kernel/chainparams.h @@ -170,12 +170,12 @@ class CChainParams uint64_t nPruneAfterHeight; uint64_t m_assumed_blockchain_size; uint64_t m_assumed_chain_state_size; - std::vector vSeeds; + std::vector vSeeds; // a vector of seed to which DNS URLs are appended + std::vector vFixedSeeds; // a vector of fixed IP seeds std::vector base58Prefixes[MAX_BASE58_TYPES]; std::string bech32_hrp; ChainType m_chain_type; CBlock genesis; - std::vector vFixedSeeds; bool fDefaultConsistencyChecks; bool m_is_mockable_chain; CCheckpointData checkpointData; From 9368c2d4932bfa51dd22b47c7c6d9aef1a4cce86 Mon Sep 17 00:00:00 2001 From: fkolakovic Date: Wed, 1 May 2024 10:46:33 +0200 Subject: [PATCH 4/5] Change RPC port number --- contrib/linearize/README.md | 2 +- contrib/linearize/linearize-hashes.py | 2 +- contrib/zmq/zmq_sub.py | 16 ++++++++-------- doc/JSON-RPC-interface.md | 10 +++++----- doc/REST-interface.md | 8 ++++---- src/chainparamsbase.cpp | 6 +++--- src/rpc/util.cpp | 4 ++-- src/test/rpc_tests.cpp | 6 +++--- src/vincoin-cli.cpp | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/contrib/linearize/README.md b/contrib/linearize/README.md index 70617437ea6ce..4a4cbc330d27f 100644 --- a/contrib/linearize/README.md +++ b/contrib/linearize/README.md @@ -11,7 +11,7 @@ Required configuration file settings for linearize-hashes: Optional config file setting for linearize-hashes: * RPC: `host` (Default: `127.0.0.1`) -* RPC: `port` (Default: `8332`) +* RPC: `port` (Default: `6332`) * Blockchain: `min_height`, `max_height` * `rev_hash_bytes`: If true, the written block hash list will be byte-reversed. (In other words, the hash returned by getblockhash will have its diff --git a/contrib/linearize/linearize-hashes.py b/contrib/linearize/linearize-hashes.py index 1f114afb4ae16..8e5825aff6df7 100755 --- a/contrib/linearize/linearize-hashes.py +++ b/contrib/linearize/linearize-hashes.py @@ -114,7 +114,7 @@ def get_rpc_cookie(): if 'host' not in settings: settings['host'] = '127.0.0.1' if 'port' not in settings: - settings['port'] = 8332 + settings['port'] = 6332 if 'min_height' not in settings: settings['min_height'] = 0 if 'max_height' not in settings: diff --git a/contrib/zmq/zmq_sub.py b/contrib/zmq/zmq_sub.py index c3027cf44be10..034246103d8d6 100755 --- a/contrib/zmq/zmq_sub.py +++ b/contrib/zmq/zmq_sub.py @@ -6,13 +6,13 @@ """ ZMQ example using python3's asyncio - Vincoin should be started with the command line arguments: - vincoind -testnet -daemon \ - -zmqpubrawtx=tcp://127.0.0.1:28332 \ - -zmqpubrawblock=tcp://127.0.0.1:28332 \ - -zmqpubhashtx=tcp://127.0.0.1:28332 \ - -zmqpubhashblock=tcp://127.0.0.1:28332 \ - -zmqpubsequence=tcp://127.0.0.1:28332 + Vitcoin should be started with the command line arguments: + vitcoind -testnet -daemon \ + -zmqpubrawtx=tcp://127.0.0.1:26332 \ + -zmqpubrawblock=tcp://127.0.0.1:26332 \ + -zmqpubhashtx=tcp://127.0.0.1:26332 \ + -zmqpubhashblock=tcp://127.0.0.1:26332 \ + -zmqpubsequence=tcp://127.0.0.1:26332 We use the asyncio library here. `self.handle()` installs itself as a future at the end of the function. Since it never returns with the event @@ -34,7 +34,7 @@ print("This example only works with Python 3.5 and greater") sys.exit(1) -port = 28332 +port = 26332 class ZMQHandler(): def __init__(self): diff --git a/doc/JSON-RPC-interface.md b/doc/JSON-RPC-interface.md index c6a7ec26d1691..d81256936de33 100644 --- a/doc/JSON-RPC-interface.md +++ b/doc/JSON-RPC-interface.md @@ -32,11 +32,11 @@ requests when multiple wallets are in use. ### Examples ```sh -# Get block count from the / endpoint when rpcuser=alice and rpcport=38332 -$ curl --user alice --data-binary '{"jsonrpc": "1.0", "id": "0", "method": "getblockcount", "params": []}' -H 'content-type: text/plain;' localhost:38332/ +# Get block count from the / endpoint when rpcuser=alice and rpcport=36332 +$ curl --user alice --data-binary '{"jsonrpc": "1.0", "id": "0", "method": "getblockcount", "params": []}' -H 'content-type: text/plain;' localhost:36332/ -# Get balance from the /wallet/walletname endpoint when rpcuser=alice, rpcport=38332 and rpcwallet=desc-wallet -$ curl --user alice --data-binary '{"jsonrpc": "1.0", "id": "0", "method": "getbalance", "params": []}' -H 'content-type: text/plain;' localhost:38332/wallet/desc-wallet +# Get balance from the /wallet/walletname endpoint when rpcuser=alice, rpcport=36332 and rpcwallet=desc-wallet +$ curl --user alice --data-binary '{"jsonrpc": "1.0", "id": "0", "method": "getbalance", "params": []}' -H 'content-type: text/plain;' localhost:36332/wallet/desc-wallet ``` @@ -126,7 +126,7 @@ RPC interface will be abused. need to expose the RPC port to the host system. The default way to do this in Docker also exposes the port to the public Internet. Instead, expose it only on the host system's localhost, for example: - `-p 127.0.0.1:8332:8332` + `-p 127.0.0.1:6332:6332` - **Secure authentication:** By default, when no `rpcpassword` is specified, Vincoin Core generates unique login credentials each time it restarts and puts them into a file diff --git a/doc/REST-interface.md b/doc/REST-interface.md index 3d084a2606fab..cd862e8921b4a 100644 --- a/doc/REST-interface.md +++ b/doc/REST-interface.md @@ -3,8 +3,8 @@ Unauthenticated REST Interface The REST API can be enabled with the `-rest` option. -The interface runs on the same port as the JSON-RPC interface, by default port 8332 for mainnet, port 18332 for testnet, -port 38332 for signet, and port 18443 for regtest. +The interface runs on the same port as the JSON-RPC interface, by default port 6332 for mainnet, port 16332 for testnet, +port 36332 for signet, and port 18443 for regtest. REST Interface consistency guarantees ------------------------------------- @@ -106,7 +106,7 @@ input and output serialization (relevant for `bin` and `hex` output formats). Example: ``` -$ curl localhost:18332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp +$ curl localhost:16332/rest/getutxos/checkmempool/b2cdfd7b89def827ff8af7cd9bff7627ff72e5e8b0f71210f92ea7a4000c5d75-0.json 2>/dev/null | json_pp { "chainHeight" : 325347, "chaintipHash" : "00000000fb01a7f3745a717f8caebee056c484e6e0bfe4a9591c235bb70506fb", @@ -146,4 +146,4 @@ Refer to the `getrawmempool` RPC help for details. Defaults to setting Risks ------------- -Running a web browser on the same node with a REST enabled vincoind can be a risk. Accessing prepared XSS websites could read out tx/block data of your node by placing links like `