tiamak/p2pool-salvium-stare
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New merge mining test

Browse Source
This commit is contained in:
SChernykh
2024-08-09 15:54:43 +02:00
parent 4b1c077b4a
commit 2eea660184
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pool_block.h
+3 -3
View File
@@ -42,7 +42,7 @@ class SideChain;
* |xxxNONCExxxEXTRA_NONCExHASHxxx|xxxxxxxxxxxxxxxxx| * |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) * 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 * 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 // Oct 12 2024 20:00:00 GMT+0000
static constexpr uint64_t MERGE_MINING_FORK_TIME = 1728763200; static constexpr uint64_t MERGE_MINING_FORK_TIME = 1728763200;
// Jun 18 2024 20:00:00 GMT+0000 // Aug 11 2024 20:00:00 GMT+0000
static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1718740800; static constexpr uint64_t MERGE_MINING_TESTNET_FORK_TIME = 1723406400;
struct DifficultyData struct DifficultyData
{ {
tests/src/mm_test_config.json
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"name": "mm_test2", "name": "mm_test3",
"password": "", "password": "",
"block_time": 10, "block_time": 10,
"min_diff": 100000, "min_diff": 100000,