From 0ec08e8aac0a1a73bc7059aeb1ac91437ead0067 Mon Sep 17 00:00:00 2001 From: WeebDataHoarder <57538841+WeebDataHoarder@users.noreply.github.com> Date: Wed, 10 Apr 2024 09:36:01 +0200 Subject: [PATCH] Document differences between share versions --- p2pool/sidechain/hardfork.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/p2pool/sidechain/hardfork.go b/p2pool/sidechain/hardfork.go index bf7a46e..8ff50cd 100644 --- a/p2pool/sidechain/hardfork.go +++ b/p2pool/sidechain/hardfork.go @@ -52,14 +52,15 @@ const ( ShareVersion_V2 // ShareVersion_V3 Tentative future version with merge mining support. - // Fixed Merge Mining Tag with a proper merkle root + proof on side data + // Fixed Merge Mining Tag encoding, replace template id with a proper merkle root and other auxiliary data + // Merkle proof added on side data + // Template Id is now included as part of pruned blocks ShareVersion_V3 ) // P2PoolShareVersion -// P2Pool forks to v2 at 2023-03-18 21:00 UTC // Different miners can have different timestamps, -// so a temporary mix of v1 and v2 blocks is allowed +// so a temporary mix of old and new blocks is allowed func P2PoolShareVersion(consensus *Consensus, timestamp uint64) ShareVersion { hardForks := consensus.HardForks