From 08e097a7d85a69aa8b59bc37d93697497d8f56af Mon Sep 17 00:00:00 2001 From: freddi8e Date: Thu, 31 Jul 2025 15:48:30 +0800 Subject: [PATCH 1/2] fix mine block --- miner/worker.go | 1 + 1 file changed, 1 insertion(+) diff --git a/miner/worker.go b/miner/worker.go index 1c87362f4..afab9a7e1 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -401,6 +401,7 @@ func recalcRecommit(minRecommit, prev time.Duration, target float64, inc bool) t } else { next = prevF*(1-intervalAdjustRatio) + intervalAdjustRatio*(target-intervalAdjustBias) min := float64(minRecommit.Nanoseconds()) + min = min + min*intervalAdjustRatio if next < min { next = min } From a4a8cb7348d9090f825f5a96f71ca00c1b8c93e3 Mon Sep 17 00:00:00 2001 From: freddi8e Date: Thu, 31 Jul 2025 21:37:23 +0800 Subject: [PATCH 2/2] fix test --- miner/worker_test.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/miner/worker_test.go b/miner/worker_test.go index 59fbbbcdc..defe0e818 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -297,9 +297,10 @@ func testAdjustInterval(t *testing.T, chainConfig *params.ChainConfig, engine co estimate := origin*(1-intervalAdjustRatio) + intervalAdjustRatio*(origin/0.8+intervalAdjustBias) wantMinInterval, wantRecommitInterval = 3*time.Second, time.Duration(estimate)*time.Nanosecond case 2: - estimate := result[index-1] + // estimate := result[index-1] min := float64(3 * time.Second.Nanoseconds()) - estimate = estimate*(1-intervalAdjustRatio) + intervalAdjustRatio*(min-intervalAdjustBias) + // estimate = estimate*(1-intervalAdjustRatio) + intervalAdjustRatio*(min-intervalAdjustBias) + estimate := min + min*intervalAdjustRatio wantMinInterval, wantRecommitInterval = 3*time.Second, time.Duration(estimate)*time.Nanosecond case 3: wantMinInterval, wantRecommitInterval = time.Second, time.Second