From 3ce57ec254a204387051085f851909666b68c3e8 Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:36:36 +0200 Subject: [PATCH] Second merge mining test --- src/pool_block.h | 4 ++-- tests/src/mm_test_config.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pool_block.h b/src/pool_block.h index d5b67a9..5f87859 100644 --- a/src/pool_block.h +++ b/src/pool_block.h @@ -66,8 +66,8 @@ static constexpr uint64_t LOG2_MERGE_MINING_MAX_CHAINS = 8; // TBD static constexpr uint64_t MERGE_MINING_FORK_TIME = std::numeric_limits::max(); -// Jun 09 2024 20:00:00 GMT+0000 -static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1717963200; +// Jun 18 2024 20:00:00 GMT+0000 +static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1718740800; struct DifficultyData { diff --git a/tests/src/mm_test_config.json b/tests/src/mm_test_config.json index 9a2deed..b89dd83 100644 --- a/tests/src/mm_test_config.json +++ b/tests/src/mm_test_config.json @@ -1,5 +1,5 @@ { - "name": "mm_test", + "name": "mm_test2", "password": "", "block_time": 10, "min_diff": 100000,