highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-09-12 05:32:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#36215: asmap: Make version match externally computed hashes

Browse Source 
7ee94bf4b0 asmap: Make outputted ASMap version match externally computed hashes (Hodlinator)

Pull request description:

  #### Problem

  Running CLI utilities such as `sha256sum` on the encoded asmap blob, and then grepping for the outputted hash in the `bitcoind` debug.log was unsuccessful.

  #### Solution

  * Change the version computation from double to single SHA256
    *Note: This invalidates serialized AddrMan data which forces re-bucketing.*
  * Avoid reversing byte order when logging the version

  Inspired by https://github.com/bitcoin/bitcoin/pull/36201#issuecomment-5605080265 + https://github.com/bitcoin/bitcoin/pull/36201#pullrequestreview-5158109401

ACKs for top commit:
  fjahr:
    tACK 7ee94bf4b0
  jurraca:
    ACK 7ee94bf4b0
  sedited:
    ACK 7ee94bf4b0

Tree-SHA512: 362edea9ebd62eeb4f9a0677386018826ca4454028d7132c31940a6ea2abf89305da916c8786aaf41012dab8c79cdc8b171c1cb3a5d815ad10ce3df1c615c45f
This commit is contained in:
merge-script
2026-09-10 19:35:07 +02:00
parent 51b540c59a 7ee94bf4b0
commit fc6923cec5
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/init.cpp
View File

@@ -1701,7 +1701,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
return false;
#endif
}
LogInfo("Using asmap version %s for IP bucketing", asmap_version.ToString());
LogInfo("Using asmap version %s for IP bucketing", HexStr(asmap_version));
} else {
node.netgroupman = std::make_unique<NetGroupManager>(NetGroupManager::NoAsmap());
LogInfo("Using /16 prefix for IP bucketing");

2
src/util/asmap.cpp
View File

@@ -349,5 +349,5 @@ uint256 AsmapVersion(const std::span<const std::byte> data)
HashWriter asmap_hasher;
asmap_hasher << data;
return asmap_hasher.GetHash();
return asmap_hasher.GetSHA256();
}

2
test/functional/feature_asmap.py
View File

@@ -22,7 +22,7 @@ from test_framework.util import (
)
ASMAP = 'src/test/data/asmap.raw' # path to unit test skeleton asmap
VERSION = 'bafc9da308f45179443bd1d22325400ac9104f741522d003e3fac86700f68895'
VERSION = '55dcec00c72b8a33a271dad20271e14cfbe5526aa1dc12e2559f30c376d85a35'
def expected_messages(filename):
return [f'Opened asmap file "{filename}" (59 bytes) from disk',