mirror of
https://github.com/SChernykh/p2pool.git
synced 2024-11-16 15:57:39 +00:00
Moved out merkle tree hash code
This commit is contained in:
SChernykh
parent
119782920a
commit
b46da74c2c
6 changed files with 172 additions and 33 deletions
|
|
@ -76,6 +76,7 @@ set(HEADERS
|
|||
src/keccak.h
|
||||
src/log.h
|
||||
src/mempool.h
|
||||
src/merkle.h
|
||||
src/p2p_server.h
|
||||
src/p2pool.h
|
||||
src/p2pool_api.h
|
||||
|
|
@ -106,6 +107,7 @@ set(SOURCES
|
|||
src/main.cpp
|
||||
src/memory_leak_debug.cpp
|
||||
src/mempool.cpp
|
||||
src/merkle.cpp
|
||||
src/p2p_server.cpp
|
||||
src/p2pool.cpp
|
||||
src/p2pool_api.cpp
|
||||
|
|
|
|||
60
src/merkle.cpp
Normal file
60
src/merkle.cpp
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
/*
|
||||
* This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
|
||||
* Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "keccak.h"
|
||||
#include "merkle.h"
|
||||
|
||||
namespace p2pool {
|
||||
|
||||
void merkle_hash(const std::vector<hash>& hashes, hash& root)
|
||||
{
|
||||
const size_t count = hashes.size();
|
||||
const uint8_t* h = hashes[0].h;
|
||||
|
||||
if (count == 1) {
|
||||
root = hashes[0];
|
||||
}
|
||||
else if (count == 2) {
|
||||
keccak(h, HASH_SIZE * 2, root.h);
|
||||
}
|
||||
else {
|
||||
size_t cnt = 1;
|
||||
do { cnt <<= 1; } while (cnt <= count);
|
||||
cnt >>= 1;
|
||||
|
||||
std::vector<hash> tmp_ints(cnt);
|
||||
|
||||
const size_t k = cnt * 2 - count;
|
||||
memcpy(tmp_ints.data(), h, k * HASH_SIZE);
|
||||
|
||||
for (size_t i = k, j = k; j < cnt; i += 2, ++j) {
|
||||
keccak(h + i * HASH_SIZE, HASH_SIZE * 2, tmp_ints[j].h);
|
||||
}
|
||||
|
||||
while (cnt > 2) {
|
||||
cnt >>= 1;
|
||||
for (size_t i = 0, j = 0; j < cnt; i += 2, ++j) {
|
||||
keccak(tmp_ints[i].h, HASH_SIZE * 2, tmp_ints[j].h);
|
||||
}
|
||||
}
|
||||
|
||||
keccak(tmp_ints[0].h, HASH_SIZE * 2, root.h);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace p2pool
|
||||
24
src/merkle.h
Normal file
24
src/merkle.h
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
/*
|
||||
* This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
|
||||
* Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace p2pool {
|
||||
|
||||
void merkle_hash(const std::vector<hash>& hashes, hash& root);
|
||||
|
||||
} // namespace p2pool
|
||||
|
|
@ -21,6 +21,7 @@
|
|||
#include "side_chain.h"
|
||||
#include "pow_hash.h"
|
||||
#include "crypto.h"
|
||||
#include "merkle.h"
|
||||
|
||||
LOG_CATEGORY(PoolBlock)
|
||||
|
||||
|
|
@ -311,39 +312,8 @@ bool PoolBlock::get_pow_hash(RandomX_Hasher_Base* hasher, uint64_t height, const
|
|||
keccak(reinterpret_cast<uint8_t*>(hashes), HASH_SIZE * 3, tmp.h);
|
||||
memcpy(h, tmp.h, HASH_SIZE);
|
||||
|
||||
if (count == 1) {
|
||||
memcpy(blob + blob_size, h, HASH_SIZE);
|
||||
}
|
||||
else if (count == 2) {
|
||||
keccak(h, HASH_SIZE * 2, tmp.h);
|
||||
memcpy(blob + blob_size, tmp.h, HASH_SIZE);
|
||||
}
|
||||
else {
|
||||
size_t i, j, cnt;
|
||||
|
||||
for (i = 0, cnt = 1; cnt <= count; ++i, cnt <<= 1) {}
|
||||
|
||||
cnt >>= 1;
|
||||
|
||||
std::vector<uint8_t> tmp_ints(cnt * HASH_SIZE);
|
||||
memcpy(tmp_ints.data(), h, (cnt * 2 - count) * HASH_SIZE);
|
||||
|
||||
for (i = cnt * 2 - count, j = cnt * 2 - count; j < cnt; i += 2, ++j) {
|
||||
keccak(h + i * HASH_SIZE, HASH_SIZE * 2, tmp.h);
|
||||
memcpy(tmp_ints.data() + j * HASH_SIZE, tmp.h, HASH_SIZE);
|
||||
}
|
||||
|
||||
while (cnt > 2) {
|
||||
cnt >>= 1;
|
||||
for (i = 0, j = 0; j < cnt; i += 2, ++j) {
|
||||
keccak(tmp_ints.data() + i * HASH_SIZE, HASH_SIZE * 2, tmp.h);
|
||||
memcpy(tmp_ints.data() + j * HASH_SIZE, tmp.h, HASH_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
keccak(tmp_ints.data(), HASH_SIZE * 2, tmp.h);
|
||||
memcpy(blob + blob_size, tmp.h, HASH_SIZE);
|
||||
}
|
||||
merkle_hash(m_transactions, tmp);
|
||||
memcpy(blob + blob_size, tmp.h, HASH_SIZE);
|
||||
}
|
||||
blob_size += HASH_SIZE;
|
||||
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ set(SOURCES
|
|||
src/difficulty_type_tests.cpp
|
||||
src/hash_tests.cpp
|
||||
src/keccak_tests.cpp
|
||||
src/merkle_tests.cpp
|
||||
src/log_tests.cpp
|
||||
src/main.cpp
|
||||
src/pool_block_tests.cpp
|
||||
|
|
@ -50,6 +51,7 @@ set(SOURCES
|
|||
../src/log.cpp
|
||||
../src/memory_leak_debug.cpp
|
||||
../src/mempool.cpp
|
||||
../src/merkle.cpp
|
||||
../src/miner.cpp
|
||||
../src/p2p_server.cpp
|
||||
../src/p2pool.cpp
|
||||
|
|
|
|||
81
tests/src/merkle_tests.cpp
Normal file
81
tests/src/merkle_tests.cpp
Normal file
|
|
@ -0,0 +1,81 @@
|
|||
/*
|
||||
* This file is part of the Monero P2Pool <https://github.com/SChernykh/p2pool>
|
||||
* Copyright (c) 2021-2023 SChernykh <https://github.com/SChernykh>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "common.h"
|
||||
#include "keccak.h"
|
||||
#include "merkle.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
namespace p2pool {
|
||||
|
||||
TEST(merkle, root_hash)
|
||||
{
|
||||
hash input[5];
|
||||
uint8_t data[] = "data 0";
|
||||
|
||||
for (size_t i = 0; i < 5; ++i, ++data[sizeof(data) - 2]) {
|
||||
keccak(data, sizeof(data) - 1, input[i].h);
|
||||
}
|
||||
|
||||
hash root;
|
||||
std::vector<hash> hashes(1, input[0]);
|
||||
|
||||
// 1 leaf
|
||||
merkle_hash(hashes, root);
|
||||
ASSERT_EQ(root, input[0]);
|
||||
|
||||
// 2 leaves
|
||||
hashes.push_back(input[1]);
|
||||
merkle_hash(hashes, root);
|
||||
|
||||
hash check[8];
|
||||
keccak(input[0].h, HASH_SIZE * 2, check[0].h);
|
||||
ASSERT_EQ(root, check[0]);
|
||||
|
||||
// 3 leaves
|
||||
hashes.push_back(input[2]);
|
||||
merkle_hash(hashes, root);
|
||||
|
||||
keccak(input[1].h, HASH_SIZE * 2, check[1].h);
|
||||
check[0] = input[0];
|
||||
keccak(check[0].h, HASH_SIZE * 2, check[0].h);
|
||||
ASSERT_EQ(root, check[0]);
|
||||
|
||||
// 4 leaves
|
||||
hashes.push_back(input[3]);
|
||||
merkle_hash(hashes, root);
|
||||
|
||||
keccak(input[0].h, HASH_SIZE * 2, check[0].h);
|
||||
keccak(input[2].h, HASH_SIZE * 2, check[1].h);
|
||||
keccak(check[0].h, HASH_SIZE * 2, check[0].h);
|
||||
ASSERT_EQ(root, check[0]);
|
||||
|
||||
// 5 leaves
|
||||
hashes.push_back(input[4]);
|
||||
merkle_hash(hashes, root);
|
||||
|
||||
check[0] = input[0];
|
||||
check[1] = input[1];
|
||||
check[2] = input[2];
|
||||
keccak(input[3].h, HASH_SIZE * 2, check[3].h);
|
||||
keccak(check[0].h, HASH_SIZE * 2, check[0].h);
|
||||
keccak(check[2].h, HASH_SIZE * 2, check[1].h);
|
||||
keccak(check[0].h, HASH_SIZE * 2, check[0].h);
|
||||
ASSERT_EQ(root, check[0]);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in a new issue