Merge 54c4b09f08 into merged_master (Bitcoin PR bitcoin/bitcoin#31042)

This commit is contained in:
Tom Trevethan 2026-04-01 17:24:49 +01:00
commit 030ab66c70
56 changed files with 153 additions and 147 deletions

View file

@ -253,7 +253,7 @@ void AddrManImpl::Unserialize(Stream& s_)
throw InvalidAddrManVersionError(strprintf(
"Unsupported format of addrman database: %u. It is compatible with formats >=%u, "
"but the maximum supported by this version of %s is %u.",
uint8_t{format}, lowest_compatible, PACKAGE_NAME, uint8_t{FILE_FORMAT}));
uint8_t{format}, lowest_compatible, CLIENT_NAME, uint8_t{FILE_FORMAT}));
}
s >> nKey;