Remove -allowfastimport (FastImport) entirely
FastImport was the legacy path for rebuilding the block index from a
local blk0001.dat. With v2 UTXO snapshots now containing embedded
blocks, FastImport is redundant and dangerous (could silently index
a forked chain from a stale blk0001.dat).
Changes:
- src/main.cpp: delete FastImportBlockFile() function (~270 lines)
- src/main.h: delete FastImportBlockFile() declaration
- src/init.cpp: delete -allowfastimport flag handler block
remove from help text
clean up stale comments referencing FastImportBlockFile
- src/bootstrap.cpp: update stale comments
v2 snapshot loading (auto-download from bootstrap or local placement
of utxo-snapshot.bin + manifest) is now the only supported sync start.
Tested: daemon builds, runs, chain state preserved across restart.
Binary SHA: 3f26f6202947a8dc0f7933314829702aafa1e42c968368ab7ec043d57baa9519
DNS2 + DNS3 running this build, both on correct chain.
Not bumped to v5.9.21 per Sami's preference. Next formal release
will inherit this change.
This commit is contained in:
+3
-3
@@ -52,7 +52,7 @@ bool NeedsBootstrap(const fs::path& dataDir)
|
||||
{
|
||||
// Need bootstrap if there's no chain database (the UTXO set / block index).
|
||||
// blk0001.dat alone is NOT sufficient — it's raw block data that requires
|
||||
// FastImport to build an index, and FastImport is disabled by default.
|
||||
// (fast-import was removed; UTXO snapshot is the only sync path)
|
||||
// Check for both LevelDB (txleveldb/) and RocksDB (chainstate/) backends.
|
||||
bool hasChainDb = fs::exists(dataDir / "txleveldb")
|
||||
|| fs::exists(dataDir / "blocks" / "chainstate")
|
||||
@@ -734,7 +734,7 @@ bool DownloadBootstrap(const std::string& host,
|
||||
|
||||
// Check if the archive included a trusted pre-built index for the active
|
||||
// backend with a valid snapshot.manifest. If verified, keep it to skip the
|
||||
// multi-hour FastImportBlockFile() rebuild.
|
||||
// multi-hour rebuild (fast-import removed; UTXO snapshot is the only sync path).
|
||||
fs::path chainDbPath = GetChainDataDir();
|
||||
fs::path database = dataDir / "database";
|
||||
fs::path manifestPath = dataDir / "snapshot.manifest";
|
||||
@@ -767,7 +767,7 @@ bool DownloadBootstrap(const std::string& host,
|
||||
|
||||
if (!keepIndex) {
|
||||
// No valid manifest or verification failed - delete the index.
|
||||
// FastImportBlockFile() will rebuild from blk0001.dat on next startup.
|
||||
// The block index will be rebuilt from the UTXO snapshot on next startup.
|
||||
printf("Bootstrap: removing extracted %s/ (will rebuild index from blk0001.dat)\n",
|
||||
GetChainDataDir().filename().string().c_str());
|
||||
if (fs::exists(chainDbPath))
|
||||
|
||||
Reference in New Issue
Block a user