Ecosystem/p2pool
1
0
Fork 0
mirror of https://github.com/SChernykh/p2pool.git synced 2024-11-16 15:57:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

New merge mining test
Some checks are pending
C/C++ CI / build-alpine-static (map[arch:aarch64 branch:latest-stable flags:-ffunction-sections -Wno-error=inline -mfix-cortex-a53-835769 -mfix-cortex-a53-843419]) (push) Waiting to run
Details
C/C++ CI / build-alpine-static (map[arch:riscv64 branch:edge flags:-ffunction-sections -Wno-error=inline]) (push) Waiting to run
Details
C/C++ CI / build-alpine-static (map[arch:x86_64 branch:latest-stable flags:-ffunction-sections -Wno-error=inline]) (push) Waiting to run
Details
C/C++ CI / build-ubuntu (map[c:gcc-11 cpp:g++-11 flags: os:ubuntu-20.04]) (push) Waiting to run
Details
C/C++ CI / build-ubuntu (map[c:gcc-12 cpp:g++-12 flags: os:ubuntu-22.04]) (push) Waiting to run
Details
C/C++ CI / build-ubuntu (map[c:gcc-8 cpp:g++-8 flags: os:ubuntu-20.04]) (push) Waiting to run
Details
C/C++ CI / build-ubuntu-static-libs (map[flags:-fuse-linker-plugin -ffunction-sections -Wno-error=inline]) (push) Waiting to run
Details
C/C++ CI / build-ubuntu-aarch64 (map[flags:-fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419 os:ubuntu-20.04]) (push) Waiting to run
Details
C/C++ CI / build-ubuntu-aarch64 (map[flags:-fuse-linker-plugin -ffunction-sections -mfix-cortex-a53-835769 -mfix-cortex-a53-843419 os:ubuntu-22.04]) (push) Waiting to run
Details
C/C++ CI / build-windows-msys2 (map[c:clang cxx:clang++ flags:-fuse-ld=lld -Wno-unused-command-line-argument -Wno-nan-infinity-disabled]) (push) Waiting to run
Details
C/C++ CI / build-windows-msys2 (map[c:gcc cxx:g++ flags:-ffunction-sections -Wno-error=maybe-uninitialized -Wno-error=attributes]) (push) Waiting to run
Details
C/C++ CI / build-windows-msbuild (map[grpc:OFF os:2019 rx:OFF tls:OFF upnp:OFF vs:Visual Studio 16 2019 vspath:C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise]) (push) Waiting to run
Details
C/C++ CI / build-windows-msbuild (map[grpc:OFF os:2019 rx:OFF tls:ON upnp:OFF vs:Visual Studio 16 2019 vspath:C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise]) (push) Waiting to run
Details
C/C++ CI / build-windows-msbuild (map[grpc:OFF os:2019 rx:OFF tls:ON upnp:ON vs:Visual Studio 16 2019 vspath:C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise]) (push) Waiting to run
Details
C/C++ CI / build-windows-msbuild (map[grpc:OFF os:2019 rx:ON tls:ON upnp:ON vs:Visual Studio 16 2019 vspath:C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise]) (push) Waiting to run
Details
C/C++ CI / build-windows-msbuild (map[grpc:ON os:2019 rx:ON tls:ON upnp:ON vs:Visual Studio 16 2019 vspath:C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise]) (push) Waiting to run
Details
C/C++ CI / build-windows-msbuild (map[grpc:ON os:2022 rx:ON tls:ON upnp:ON vs:Visual Studio 17 2022 vspath:C:\Program Files\Microsoft Visual Studio\2022\Enterprise]) (push) Waiting to run
Details
C/C++ CI / build-macos (push) Waiting to run
Details
C/C++ CI / build-macos-aarch64 (push) Waiting to run
Details
C/C++ CI / build-freebsd (map[architecture:x86-64 host:ubuntu-latest name:freebsd version:13.3]) (push) Waiting to run
Details
C/C++ CI / build-openbsd (map[architecture:x86-64 host:ubuntu-latest name:openbsd version:7.4]) (push) Waiting to run
Details
clang-tidy / clang-tidy (push) Waiting to run
Details
CodeQL / Analyze (cpp) (push) Waiting to run
Details
cppcheck / cppcheck-ubuntu (push) Waiting to run
Details
cppcheck / cppcheck-windows (push) Waiting to run
Details
Microsoft C++ Code Analysis / Analyze (push) Waiting to run
Details
source-snapshot / source-snapshot (push) Waiting to run
Details
Sync test (old) / sync-test-ubuntu-tsan (push) Waiting to run
Details
Sync test (old) / sync-test-ubuntu-msan (push) Waiting to run
Details
Sync test (old) / sync-test-ubuntu-ubsan (push) Waiting to run
Details
Sync test (old) / sync-test-ubuntu-asan (push) Waiting to run
Details
Sync test (old) / sync-test-macos (map[flags:-Og -ftrapv -target arm64-apple-macos-11 os:macos-14]) (push) Waiting to run
Details
Sync test (old) / sync-test-macos (map[flags:-Og -ftrapv os:macos-13]) (push) Waiting to run
Details
Sync test (old) / sync-test-windows-debug-asan (push) Waiting to run
Details
Sync test (old) / sync-test-windows-leaks (push) Waiting to run
Details
Sync test / sync-test-ubuntu-tsan (push) Waiting to run
Details
Sync test / sync-test-ubuntu-msan (push) Waiting to run
Details
Sync test / sync-test-ubuntu-ubsan (push) Waiting to run
Details
Sync test / sync-test-ubuntu-asan (push) Waiting to run
Details
Sync test / sync-test-macos (map[flags:-Og -ftrapv -target arm64-apple-macos-11 os:macos-14]) (push) Waiting to run
Details
Sync test / sync-test-macos (map[flags:-Og -ftrapv os:macos-13]) (push) Waiting to run
Details
Sync test / sync-test-windows-debug-asan (push) Waiting to run
Details
Sync test / sync-test-windows-leaks (push) Waiting to run
Details

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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/pool_block.h
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
{ {

2
tests/src/mm_test_config.json
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,