Fix 17383

UdjinM6 · UdjinM6 · commit 781f6b9092b0 · 2021-08-08T19:06:39.000+03:00
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -67,12 +67,6 @@
 #define MICRO 0.000001
 #define MILLI 0.001
 
-/**
-* An extra transaction can be added to a package, as long as it only has one
-* ancestor and is no larger than this. Not really any reason to make this
-* configurable as it doesn't materially change DoS parameters.
-*/
-static const unsigned int EXTRA_DESCENDANT_TX_SIZE_LIMIT = 10000;
 /** Maximum kilobytes for transactions to store for processing during reorg */
 static const unsigned int MAX_DISCONNECTED_TX_POOL_SIZE = 20000;
 /** The pre-allocation chunk size for blk?????.dat files (since 0.8) */
diff --git a/src/validation.h b/src/validation.h
@@ -101,15 +101,15 @@ static const unsigned int MIN_BLOCKS_TO_KEEP = 288;
 static const signed int DEFAULT_CHECKBLOCKS = 6;
 static const unsigned int DEFAULT_CHECKLEVEL = 3;
 
-// Require that user allocate at least 550 MiB for block & undo files (blk???.dat and rev???.dat)
-// At 1MB per block, 288 blocks = 288MB.
-// Add 15% for Undo data = 331MB
-// Add 20% for Orphan block rate = 397MB
-// We want the low water mark after pruning to be at least 397 MB and since we prune in
+// Require that user allocate at least 945MB for block & undo files (blk???.dat and rev???.dat)
+// At 2MB per block, 288 blocks = 576MB.
+// Add 15% for Undo data = 662MB
+// Add 20% for Orphan block rate = 794MB
+// We want the low water mark after pruning to be at least 794 MB and since we prune in
 // full block file chunks, we need the high water mark which triggers the prune to be
-// one 128MB block file + added 15% undo data = 147MB greater for a total of 545MB
-// Setting the target to >= 550 MiB will make it likely we can respect the target.
-static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 550 * 1024 * 1024;
+// one 128MB block file + added 15% undo data = 147MB greater for a total of 941MB
+// Setting the target to > than 945MB will make it likely we can respect the target.
+static const uint64_t MIN_DISK_SPACE_FOR_BLOCK_FILES = 945 * 1024 * 1024;
 
 struct BlockHasher
 {
