diff --git a/include/bitcoin/network/settings.hpp b/include/bitcoin/network/settings.hpp index 71e7020c0..c9acd4ff1 100644 --- a/include/bitcoin/network/settings.hpp +++ b/include/bitcoin/network/settings.hpp @@ -318,7 +318,9 @@ struct BCT_API settings // TODO: from bitcoind, replace with libbitcoin seeds when up. case system::chain::selection::mainnet: { - seeds.reserve(8); + seeds.reserve(10); + seeds.emplace_back("carmine.libbitcoin.net", 8333_u16); + seeds.emplace_back("wormer.libbitcoin.net", 8333_u16); seeds.emplace_back("seed.bitcoin.sipa.be", 8333_u16); seeds.emplace_back("dnsseed.bluematt.me", 8333_u16); seeds.emplace_back("seed.bitcoin.jonasschnelli.ch", @@ -335,7 +337,9 @@ struct BCT_API settings { connections = 50; connect_batch_size = 10; - seeds.reserve(3); + seeds.reserve(5); + seeds.emplace_back("carmine.libbitcoin.net", 18333_u16); + seeds.emplace_back("wormer.libbitcoin.net", 18333_u16); seeds.emplace_back("testnet-seed.bitcoin.jonasschnelli.ch", 18333_u16); seeds.emplace_back("seed.tbtc.petertodd.net", 18333_u16); @@ -347,7 +351,9 @@ struct BCT_API settings { connections = 50; connect_batch_size = 10; - seeds.reserve(2); + seeds.reserve(4); + seeds.emplace_back("carmine.libbitcoin.net", 48333_u16); + seeds.emplace_back("wormer.libbitcoin.net", 48333_u16); seeds.emplace_back("seed.testnet4.bitcoin.sprovoost.nl", 48333_u16); seeds.emplace_back("seed.testnet4.wiz.biz", 48333_u16); @@ -357,6 +363,9 @@ struct BCT_API settings { connections = 50; connect_batch_size = 10; + seeds.reserve(2); + seeds.emplace_back("carmine.libbitcoin.net", 18353_u16); + seeds.emplace_back("wormer.libbitcoin.net", 18353_u16); break; } case system::chain::selection::signet: diff --git a/test/settings.cpp b/test/settings.cpp index 2519233ab..847fbecf1 100644 --- a/test/settings.cpp +++ b/test/settings.cpp @@ -68,7 +68,7 @@ BC_AUTO_TEST_CASE(settings__construct__mainnet__expected) settings instance{ selection::mainnet }; BC_REQUIRE(instance.network == selection::mainnet); BC_REQUIRE_EQUAL(instance.identifier, 3652501241u); - BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 8u); + BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 10u); BC_REQUIRE_EQUAL(instance.outbound.seeds.front().port(), 8333u); BC_REQUIRE_EQUAL(instance.outbound.connections, 100u); BC_REQUIRE_EQUAL(instance.outbound.connect_batch_size, 5u); @@ -84,7 +84,7 @@ BC_AUTO_TEST_CASE(settings__construct__testnet3__expected) settings instance{ selection::testnet3 }; BC_REQUIRE(instance.network == selection::testnet3); BC_REQUIRE_EQUAL(instance.identifier, 118034699u); - BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 3u); + BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 5u); BC_REQUIRE_EQUAL(instance.outbound.seeds.front().port(), 18333u); BC_REQUIRE_EQUAL(instance.outbound.connections, 50u); BC_REQUIRE_EQUAL(instance.outbound.connect_batch_size, 10u); @@ -100,7 +100,7 @@ BC_AUTO_TEST_CASE(settings__construct__testnet4__expected) settings instance{ selection::testnet4 }; BC_REQUIRE(instance.network == selection::testnet4); BC_REQUIRE_EQUAL(instance.identifier, 675223068u); - BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 2u); + BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 4u); BC_REQUIRE_EQUAL(instance.outbound.seeds.front().port(), 48333u); BC_REQUIRE_EQUAL(instance.outbound.connections, 50u); BC_REQUIRE_EQUAL(instance.outbound.connect_batch_size, 10u); @@ -147,7 +147,8 @@ BC_AUTO_TEST_CASE(settings__construct__testnet5__expected) settings instance{ selection::testnet5 }; BC_REQUIRE(instance.network == selection::testnet5); BC_REQUIRE_EQUAL(instance.identifier, 1163282758u); - BC_REQUIRE(instance.outbound.seeds.empty()); + BC_REQUIRE_EQUAL(instance.outbound.seeds.size(), 2u); + BC_REQUIRE_EQUAL(instance.outbound.seeds.front().port(), 18353u); BC_REQUIRE_EQUAL(instance.outbound.connections, 50u); BC_REQUIRE_EQUAL(instance.outbound.connect_batch_size, 10u); BC_REQUIRE_EQUAL(instance.outbound.host_pool_capacity, 10000u);