Merge pull request #2425 from CortexFoundation/dev

ucwong · web-flow · commit 4aa5353ef4f6 · 2025-07-18T10:32:24.000+01:00
fix announcement drop logic
diff --git a/ctxc/fetcher/tx_fetcher.go b/ctxc/fetcher/tx_fetcher.go
@@ -415,7 +415,7 @@ func (f *TxFetcher) loop() {
 			want := used + len(ann.hashes)
 			if want > maxTxAnnounces {
 				txAnnounceDOSMeter.Mark(int64(want - maxTxAnnounces))
-				ann.hashes = ann.hashes[:want-maxTxAnnounces]
+				ann.hashes = ann.hashes[:maxTxAnnounces-used]
 			}
 			// All is well, schedule the remainder of the transactions
 			var (

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ func (f *TxFetcher) loop() {`
`415`	`415`	`want := used + len(ann.hashes)`
`416`	`416`	`if want > maxTxAnnounces {`
`417`	`417`	`txAnnounceDOSMeter.Mark(int64(want - maxTxAnnounces))`
`418`		`- ann.hashes = ann.hashes[:want-maxTxAnnounces]`
	`418`	`+ ann.hashes = ann.hashes[:maxTxAnnounces-used]`
`419`	`419`	`}`
`420`	`420`	`// All is well, schedule the remainder of the transactions`
`421`	`421`	`var (`