From 2eea6601849ea3a191c8c19a78abadc030b00945 Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Fri, 9 Aug 2024 15:54:43 +0200 Subject: [PATCH] New merge mining test --- src/pool_block.h | 6 +++--- tests/src/mm_test_config.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pool_block.h b/src/pool_block.h index c00f28b..16b457d 100644 --- a/src/pool_block.h +++ b/src/pool_block.h @@ -42,7 +42,7 @@ class SideChain; * |xxxNONCExxxEXTRA_NONCExHASHxxx|xxxxxxxxxxxxxxxxx| * -------------------------------------------------- * -* HASH comes in TX_EXTRA_MERGE_MINING_TAG directly after EXTRA_NONCE +* HASH (or Merkle tree root hash) comes in TX_EXTRA_MERGE_MINING_TAG directly after EXTRA_NONCE * HASH is calculated from all pool block's bytes and consensus ID (NONCE, EXTRA_NONCE and HASH itself are replaced with 0's when calculating HASH) * Pool block's PoW hash is calculated from the Monero block template part using Monero's consensus rules */ @@ -66,8 +66,8 @@ static constexpr uint64_t LOG2_MERGE_MINING_MAX_CHAINS = 8; // Oct 12 2024 20:00:00 GMT+0000 static constexpr uint64_t MERGE_MINING_FORK_TIME = 1728763200; -// Jun 18 2024 20:00:00 GMT+0000 -static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1718740800; +// Aug 11 2024 20:00:00 GMT+0000 +static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1723406400; struct DifficultyData { diff --git a/tests/src/mm_test_config.json b/tests/src/mm_test_config.json index b89dd83..79354b3 100644 --- a/tests/src/mm_test_config.json +++ b/tests/src/mm_test_config.json @@ -1,5 +1,5 @@ { - "name": "mm_test2", + "name": "mm_test3", "password": "", "block_time": 10, "min_diff": 100000,