Skip to content

Commit c7b8f6f

Browse files
committed
Merge bitcoin/bitcoin#30625: chainparams: Handle Testnet4 in GetNetworkForMagic
b0ec871 chainparams: Handle Testnet4 in GetNetworkForMagic (Fabian Jahr) Pull request description: Found during testing: The recently introduced `GetNetworkForMagic()` doesn't handle Testnet4 yet. ACKs for top commit: tdb3: cr ACK b0ec871 maflcko: review ACK b0ec871 theStack: ACK b0ec871 willcl-ark: crACK b0ec871 Tree-SHA512: 77cd0a6791529e5c5dfdb25cff3eff77224be9058d7cf4a8b3544651eb44c5e8ee90c5abfb9751ab0e11c5aa2d8477831dbf1868c4d5909481e0979e4db1eb28
2 parents c831c9a + b0ec871 commit c7b8f6f

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

src/kernel/chainparams.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -685,13 +685,16 @@ std::optional<ChainType> GetNetworkForMagic(const MessageStartChars& message)
685685
{
686686
const auto mainnet_msg = CChainParams::Main()->MessageStart();
687687
const auto testnet_msg = CChainParams::TestNet()->MessageStart();
688+
const auto testnet4_msg = CChainParams::TestNet4()->MessageStart();
688689
const auto regtest_msg = CChainParams::RegTest({})->MessageStart();
689690
const auto signet_msg = CChainParams::SigNet({})->MessageStart();
690691

691692
if (std::equal(message.begin(), message.end(), mainnet_msg.data())) {
692693
return ChainType::MAIN;
693694
} else if (std::equal(message.begin(), message.end(), testnet_msg.data())) {
694695
return ChainType::TESTNET;
696+
} else if (std::equal(message.begin(), message.end(), testnet4_msg.data())) {
697+
return ChainType::TESTNET4;
695698
} else if (std::equal(message.begin(), message.end(), regtest_msg.data())) {
696699
return ChainType::REGTEST;
697700
} else if (std::equal(message.begin(), message.end(), signet_msg.data())) {

0 commit comments

Comments
 (0)