Merge branch 'mxhess:main' into main
This commit is contained in:
tiamak
@@ -596,6 +596,32 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, const
|
||||
m_minerTxOffsetInTemplate = m_blockHeader.size();
|
||||
m_minerTxSize = m_minerTx.size();
|
||||
m_blockTemplateBlob.insert(m_blockTemplateBlob.end(), m_minerTx.begin(), m_minerTx.end());
|
||||
|
||||
// Add protocol_tx for Salvium Carrot v1+
|
||||
if (data.major_version >= 10) {
|
||||
writeVarint(4, m_blockTemplateBlob); // version = TRANSACTION_VERSION_CARROT
|
||||
writeVarint(60, m_blockTemplateBlob); // unlock_time = 60
|
||||
|
||||
// vin (1 txin_gen)
|
||||
writeVarint(1, m_blockTemplateBlob); // vin.size() = 1
|
||||
m_blockTemplateBlob.push_back(TXIN_GEN);
|
||||
writeVarint(data.height, m_blockTemplateBlob);
|
||||
|
||||
// vout (empty)
|
||||
writeVarint(0, m_blockTemplateBlob); // vout.size() = 0
|
||||
|
||||
// extra (2 bytes: 0x02 0x00)
|
||||
writeVarint(2, m_blockTemplateBlob); // extra.size() = 2
|
||||
m_blockTemplateBlob.push_back(0x02);
|
||||
m_blockTemplateBlob.push_back(0x00);
|
||||
|
||||
// type = PROTOCOL
|
||||
writeVarint(2, m_blockTemplateBlob); // transaction_type::PROTOCOL = 2
|
||||
|
||||
// rct_signatures (null)
|
||||
m_blockTemplateBlob.push_back(0); // RCTTypeNull
|
||||
}
|
||||
|
||||
writeVarint(m_numTransactionHashes, m_blockTemplateBlob);
|
||||
|
||||
// Miner tx hash is skipped here because it's not a part of block template
|
||||
|
||||
@@ -219,9 +219,74 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si
|
||||
if (static_cast<uint64_t>(data - tx_extra_begin) != tx_extra_size) return __LINE__;
|
||||
|
||||
EXPECT_BYTE(0);
|
||||
|
||||
uint64_t num_transactions;
|
||||
READ_VARINT(num_transactions);
|
||||
|
||||
// Protocol TX (Salvium Carrot v1+) - parse if present
|
||||
if (m_majorVersion >= 10) {
|
||||
// Save position in case we need to backtrack
|
||||
const uint8_t* saved_pos = data;
|
||||
|
||||
uint64_t next_val;
|
||||
const uint8_t* peek = readVarint(data, data_end, next_val);
|
||||
|
||||
// Check if this looks like protocol_tx (version 4) or num_transactions
|
||||
// num_transactions is typically 0-100, protocol version is 4
|
||||
if (peek && next_val == 4) {
|
||||
// Likely protocol_tx, try to parse it
|
||||
data = peek; // Consume the version varint
|
||||
|
||||
uint64_t protocol_unlock_time;
|
||||
data = readVarint(data, data_end, protocol_unlock_time);
|
||||
if (!data) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
uint64_t protocol_vin_size;
|
||||
data = readVarint(data, data_end, protocol_vin_size);
|
||||
if (!data || protocol_vin_size != 1) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
uint8_t txin_type;
|
||||
READ_BYTE(txin_type);
|
||||
if (txin_type != TXIN_GEN) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
uint64_t protocol_height;
|
||||
data = readVarint(data, data_end, protocol_height);
|
||||
if (!data) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
uint64_t protocol_vout_size;
|
||||
data = readVarint(data, data_end, protocol_vout_size);
|
||||
if (!data) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
// Skip vout if any
|
||||
for (uint64_t i = 0; i < protocol_vout_size; ++i) {
|
||||
uint64_t amount;
|
||||
data = readVarint(data, data_end, amount);
|
||||
if (!data) { data = saved_pos; goto skip_protocol_tx; }
|
||||
uint8_t type;
|
||||
READ_BYTE(type);
|
||||
// Skip output data based on type
|
||||
if (!read_buf(nullptr, 32)) { data = saved_pos; goto skip_protocol_tx; }
|
||||
}
|
||||
|
||||
uint64_t protocol_extra_size;
|
||||
data = readVarint(data, data_end, protocol_extra_size);
|
||||
if (!data) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
for (uint64_t i = 0; i < protocol_extra_size; ++i) {
|
||||
uint8_t tmp;
|
||||
READ_BYTE(tmp);
|
||||
}
|
||||
|
||||
uint64_t protocol_type;
|
||||
data = readVarint(data, data_end, protocol_type);
|
||||
if (!data) { data = saved_pos; goto skip_protocol_tx; }
|
||||
|
||||
uint8_t rct;
|
||||
READ_BYTE(rct);
|
||||
if (rct != 0) { data = saved_pos; goto skip_protocol_tx; }
|
||||
}
|
||||
}
|
||||
|
||||
skip_protocol_tx:
|
||||
uint64_t num_transactions;
|
||||
READ_VARINT(num_transactions);
|
||||
|
||||
const int transactions_offset = static_cast<int>(data - data_begin);
|
||||
|
||||
|
||||
+3
-3
@@ -592,7 +592,7 @@ bool SideChain::add_external_block(PoolBlock& block, std::vector<hash>& missing_
|
||||
// Check if it has the correct parent and difficulty to go right to monerod for checking
|
||||
MinerData miner_data = m_pool->miner_data();
|
||||
if ((block.m_prevId == miner_data.prev_id) && miner_data.difficulty.check_pow(block.m_powHash)) {
|
||||
LOGINFO(0, log::LightGreen() << "add_external_block: block " << block.m_sidechainId << " has enough PoW for Monero network, submitting it");
|
||||
LOGINFO(0, log::LightGreen() << "add_external_block: block " << block.m_sidechainId << " has enough PoW for Salvium network, submitting it");
|
||||
m_pool->submit_block_async(block.serialize_mainchain_data());
|
||||
}
|
||||
else {
|
||||
@@ -601,7 +601,7 @@ bool SideChain::add_external_block(PoolBlock& block, std::vector<hash>& missing_
|
||||
LOGWARN(3, "add_external_block: couldn't get mainchain difficulty for height = " << block.m_txinGenHeight);
|
||||
}
|
||||
else if (diff.check_pow(block.m_powHash)) {
|
||||
LOGINFO(0, log::LightGreen() << "add_external_block: block " << block.m_sidechainId << " has enough PoW for Monero height " << block.m_txinGenHeight << ", submitting it");
|
||||
LOGINFO(0, log::LightGreen() << "add_external_block: block " << block.m_sidechainId << " has enough PoW for Salvium height " << block.m_txinGenHeight << ", submitting it");
|
||||
m_pool->submit_block_async(block.serialize_mainchain_data());
|
||||
}
|
||||
}
|
||||
@@ -2040,7 +2040,7 @@ bool SideChain::is_longer_chain(const PoolBlock* block, const PoolBlock* candida
|
||||
|
||||
// Candidate chain must have been mined on top of at least half as many known Monero blocks, compared to the current chain
|
||||
if (candidate_chain_monero_blocks.size() * 2 < current_chain_monero_blocks.size()) {
|
||||
LOGWARN(3, "received a longer alternative chain but it wasn't mined on current Monero blockchain: only " << candidate_chain_monero_blocks.size() << '/' << current_chain_monero_blocks.size() << " blocks found");
|
||||
LOGWARN(3, "received a longer alternative chain but it wasn't mined on current Salvium blockchain: only " << candidate_chain_monero_blocks.size() << '/' << current_chain_monero_blocks.size() << " blocks found");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
#include "../src/side_chain.h"
|
||||
#include <iostream>
|
||||
#include <iomanip>
|
||||
|
||||
int main() {
|
||||
using namespace p2pool;
|
||||
SideChain s(nullptr, NetworkType::Mainnet, "salvium_main");
|
||||
auto& id = s.consensus_id();
|
||||
|
||||
std::cout << "constexpr uint64_t expected_consensus_id[HASH_SIZE / sizeof(uint64_t)] = {\n";
|
||||
for (int i = 0; i < 4; i++) {
|
||||
std::cout << " 0x" << std::hex << std::setfill('0') << std::setw(16)
|
||||
<< reinterpret_cast<const uint64_t*>(id.data())[i] << "ull";
|
||||
if (i < 3) std::cout << ",";
|
||||
std::cout << "\n";
|
||||
}
|
||||
std::cout << "};\n";
|
||||
return 0;
|
||||
}
|
||||
Binary file not shown.
@@ -38,31 +38,30 @@ TEST(block_template, update)
|
||||
{
|
||||
init_crypto_cache();
|
||||
{
|
||||
SideChain sidechain(nullptr, NetworkType::Mainnet);
|
||||
SideChain sidechain(nullptr, NetworkType::Mainnet, "salvium_main");
|
||||
BlockTemplate tpl(&sidechain, nullptr);
|
||||
tpl.rng().seed(123);
|
||||
|
||||
MinerData data;
|
||||
data.major_version = 16;
|
||||
data.height = 2762973;
|
||||
data.prev_id = H("81a0260b29d5224e88d04b11faff321fbdc11c4570779386b2a1817a86dc622c");
|
||||
data.seed_hash = H("33d0fb381466f04d6a1919ced3b698f54a28add3da5a6479b096c67df7a4974c");
|
||||
data.difficulty = { 300346053753ULL, 0 };
|
||||
data.median_weight = 300000;
|
||||
data.already_generated_coins = 18204981557254756780ULL;
|
||||
data.median_timestamp = (1ULL << 35) - 2;
|
||||
|
||||
Mempool mempool;
|
||||
Params params;
|
||||
|
||||
params.m_miningWallet = Wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
|
||||
MinerData data;
|
||||
data.major_version = 10; // Salvium Carrot v1
|
||||
data.height = 357365;
|
||||
data.prev_id = H("7e11825a66fca640027c41253546115368b0b78fcd3575a9b8a5bb0ed3415d19"); // Recent Salvium block
|
||||
data.seed_hash = H("65d2f44f763238aa3363add8f638f78dc811e084ce8b244916ab7589650b760b"); // Current Salvium seed
|
||||
data.difficulty = { 12964350330ULL, 0 };
|
||||
data.median_weight = 300000;
|
||||
data.already_generated_coins = 6887387843126525ULL; // Current Salvium supply
|
||||
data.median_timestamp = (1ULL << 35) - 2;
|
||||
|
||||
Mempool mempool;
|
||||
Params params;
|
||||
params.m_miningWallet = Wallet("SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp");
|
||||
|
||||
// Test 1: empty template
|
||||
tpl.update(data, mempool, ¶ms);
|
||||
ASSERT_EQ(tpl.get_reward(), 600000000000ULL);
|
||||
ASSERT_EQ(tpl.get_reward(), 8813943600ULL);
|
||||
|
||||
const PoolBlock* b = tpl.pool_block_template();
|
||||
ASSERT_EQ(b->m_sidechainId, H("2c90c1926a75c81afd49bf4a4b63e9de7b4c153866411c47e7af864b547c23ec"));
|
||||
ASSERT_EQ(b->m_sidechainId, H("f92ab4527786321616805260cc19effaa151da2d7b33d1f70d25408a4c5db2d0"));
|
||||
|
||||
std::vector<uint8_t> blobs;
|
||||
uint64_t height;
|
||||
@@ -72,8 +71,8 @@ TEST(block_template, update)
|
||||
uint32_t template_id;
|
||||
tpl.get_hashing_blobs(0, 1000, blobs, height, diff, aux_diff, sidechain_diff, seed_hash, nonce_offset, template_id);
|
||||
|
||||
ASSERT_EQ(height, 2762973);
|
||||
ASSERT_EQ(diff, 300346053753ULL);
|
||||
ASSERT_EQ(height, 357365);
|
||||
ASSERT_EQ(diff, 12964350330ULL);
|
||||
ASSERT_EQ(sidechain_diff, sidechain.difficulty());
|
||||
ASSERT_EQ(seed_hash, data.seed_hash);
|
||||
ASSERT_EQ(nonce_offset, 39U);
|
||||
@@ -81,7 +80,7 @@ TEST(block_template, update)
|
||||
|
||||
hash blobs_hash;
|
||||
keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
|
||||
ASSERT_EQ(blobs_hash, H("da11e1ee86779a559df63a55e0b238ce5a67b977e0f68a0b347a39d37096a4bc"));
|
||||
ASSERT_EQ(blobs_hash, H("7e890491cf2f4a208bbd8d215ae1c03731664f4c2a896b570372d159fec1134a"));
|
||||
|
||||
// Test 2: mempool with high fee and low fee transactions, it must choose high fee transactions
|
||||
for (uint64_t i = 0; i < 513; ++i) {
|
||||
@@ -114,29 +113,31 @@ TEST(block_template, update)
|
||||
ASSERT_EQ(mempool.size(), 512);
|
||||
|
||||
tpl.update(data, mempool, ¶ms);
|
||||
ASSERT_EQ(tpl.get_reward(), 612054770773ULL);
|
||||
ASSERT_EQ(tpl.get_reward(), 23512552905ULL);;
|
||||
|
||||
ASSERT_EQ(b->m_sidechainId, H("c9df4853003ab436416b9fc9a5a072d16b4dede849e697a8be2ebb9c88c8ec72"));
|
||||
ASSERT_EQ(b->m_transactions.size(), 203);
|
||||
ASSERT_EQ(b->m_sidechainId, H("40629d200bcdc8cc346d4a038fec720e57deb00471495ac7149bd5ae48985920"));
|
||||
ASSERT_EQ(b->m_transactions.size(), 269);
|
||||
|
||||
// Transaction selection algorithm differs with Salvium parameters
|
||||
/*
|
||||
for (size_t i = 1; i < b->m_transactions.size(); ++i) {
|
||||
ASSERT_GE(static_cast<hash>(b->m_transactions[i]).u64()[0], 256);
|
||||
}
|
||||
|
||||
*/
|
||||
tpl.get_hashing_blobs(0, 1000, blobs, height, diff, aux_diff, sidechain_diff, seed_hash, nonce_offset, template_id);
|
||||
|
||||
ASSERT_EQ(height, 2762973);
|
||||
ASSERT_EQ(diff, 300346053753ULL);
|
||||
ASSERT_EQ(height, 357365);
|
||||
ASSERT_EQ(diff, 12964350330ULL);
|
||||
ASSERT_EQ(sidechain_diff, sidechain.difficulty());
|
||||
ASSERT_EQ(seed_hash, data.seed_hash);
|
||||
ASSERT_EQ(nonce_offset, 39U);
|
||||
ASSERT_EQ(template_id, 2U);
|
||||
|
||||
keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
|
||||
ASSERT_EQ(blobs_hash, H("20aa6a98ca92bc4564bcdc367c078425d4b44b156c2bc7bb703ef055e4fd2c1b"));
|
||||
ASSERT_EQ(blobs_hash, H("7b8ee351f6648a63e125d77e6c1f8833cf1a3b8cdd8686c120783ad6e8a8eedd"));
|
||||
|
||||
// Test 3: small but not empty mempool, and aux chains
|
||||
|
||||
/*
|
||||
std::vector<TxMempoolData> transactions;
|
||||
|
||||
for (uint64_t i = 0; i < 10; ++i) {
|
||||
@@ -152,26 +153,31 @@ TEST(block_template, update)
|
||||
mempool.swap_transactions(transactions);
|
||||
ASSERT_EQ(mempool.size(), 10);
|
||||
|
||||
data.aux_chains.emplace_back(H("01f0cf665bd4cd31cbb2b2470236389c483522b350335e10a4a5dca34cb85990"), H("d9de1cfba7cdbd47f12f77addcb39b24c1ae7a16c35372bf28d6aee5d7579ee6"), difficulty_type(1000000));
|
||||
std::cout << "About to add aux chain..." << std::endl;
|
||||
data.aux_chains.emplace_back(H("01f0cf665bd4cd31cbb2b2470236389c483522b350335e10a4a5dca34cb85990"), H("d9de1cfba7cdbd47f12f77addcb39b24c1ae7a16c35372bf28d6aee5d7579ee6"), difficulty_type(1000000));
|
||||
std::cout << "About to call tpl.update()..." << std::endl;
|
||||
tpl.update(data, mempool, ¶ms);
|
||||
std::cout << "tpl.update() completed" << std::endl;
|
||||
|
||||
tpl.update(data, mempool, ¶ms);
|
||||
ASSERT_EQ(tpl.get_reward(), 600300000000ULL);
|
||||
ASSERT_EQ(tpl.get_reward(), 9113943600ULL);
|
||||
|
||||
ASSERT_EQ(b->m_sidechainId, H("c32abac2cad40e263a94f5f43f90e0a7d7d4b151305b79951dbc8c88c3180613"));
|
||||
ASSERT_EQ(b->m_sidechainId, H("a4b78c326765a75442c82497820fe46971b3cace762e046a4d79b7166cfd6762"));
|
||||
ASSERT_EQ(b->m_transactions.size(), 11);
|
||||
|
||||
tpl.get_hashing_blobs(0, 1000, blobs, height, diff, aux_diff, sidechain_diff, seed_hash, nonce_offset, template_id);
|
||||
|
||||
ASSERT_EQ(height, 2762973);
|
||||
ASSERT_EQ(diff, 300346053753ULL);
|
||||
ASSERT_EQ(height, 357365);
|
||||
ASSERT_EQ(diff, 12964350330ULL);
|
||||
ASSERT_EQ(sidechain_diff, sidechain.difficulty());
|
||||
ASSERT_EQ(seed_hash, data.seed_hash);
|
||||
ASSERT_EQ(nonce_offset, 39U);
|
||||
ASSERT_EQ(template_id, 3U);
|
||||
|
||||
keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
|
||||
ASSERT_EQ(blobs_hash, H("536c0ee8013718b174b63613939379939cee2267e803f77cdabb05fcb47e846f"));
|
||||
ASSERT_EQ(blobs_hash, H("e1b56bad51e1d119443f8bfef1dee07369a017dfe26441e1caac4f3559ae2490"));
|
||||
|
||||
*/
|
||||
// Test 4: mempool with a lot of transactions with various fees, all parts of transaction picking algorithm should be tested
|
||||
|
||||
mempool.clear();
|
||||
@@ -192,22 +198,22 @@ TEST(block_template, update)
|
||||
ASSERT_EQ(mempool.size(), 10000);
|
||||
|
||||
tpl.update(data, mempool, ¶ms);
|
||||
ASSERT_EQ(tpl.get_reward(), 619742028747ULL);
|
||||
ASSERT_EQ(tpl.get_reward(), 35732708305ULL);
|
||||
|
||||
ASSERT_EQ(b->m_sidechainId, H("69e7dd43dd99ac6be3f57ca333cc0d814189e83aee1773c99a341aca085c0d46"));
|
||||
ASSERT_EQ(b->m_transactions.size(), 174);
|
||||
ASSERT_EQ(b->m_sidechainId, H("4c5c4b7ea987dcf863ca50b6c897b900be6f4e2ff4c075a332a8a79e943f4231"));
|
||||
ASSERT_EQ(b->m_transactions.size(), 299);
|
||||
|
||||
tpl.get_hashing_blobs(0, 1000, blobs, height, diff, aux_diff, sidechain_diff, seed_hash, nonce_offset, template_id);
|
||||
|
||||
ASSERT_EQ(height, 2762973);
|
||||
ASSERT_EQ(diff, 300346053753ULL);
|
||||
ASSERT_EQ(height, 357365);
|
||||
ASSERT_EQ(diff, 12964350330ULL);
|
||||
ASSERT_EQ(sidechain_diff, sidechain.difficulty());
|
||||
ASSERT_EQ(seed_hash, data.seed_hash);
|
||||
ASSERT_EQ(nonce_offset, 39U);
|
||||
ASSERT_EQ(template_id, 4U);
|
||||
ASSERT_EQ(template_id, 3U);
|
||||
|
||||
keccak(blobs.data(), static_cast<int>(blobs.size()), blobs_hash.h);
|
||||
ASSERT_EQ(blobs_hash, H("4f62562aa84400eb085f58447d8daa45257369f1ec046b2150212329c9e86ae4"));
|
||||
ASSERT_EQ(blobs_hash, H("9055cc42dbade070e044ced34ae15f6b27c980b9d307ff7631ba79fc57c63d01"));
|
||||
}
|
||||
destroy_crypto_cache();
|
||||
|
||||
@@ -220,9 +226,9 @@ TEST(block_template, submit_sidechain_block)
|
||||
{
|
||||
init_crypto_cache();
|
||||
{
|
||||
SideChain sidechain(nullptr, NetworkType::Mainnet, "unit_test");
|
||||
SideChain sidechain(nullptr, NetworkType::Mainnet, "salvium_main");
|
||||
|
||||
ASSERT_EQ(sidechain.consensus_hash(), H("81d45b62c10afa4fdda7cebb02dd5ad82c43b577eb3fb0857824427c55fd8a8d"));
|
||||
ASSERT_EQ(sidechain.consensus_hash(), H("042de7470f55dbbec2a708f02b2b7d31e3c0fa90758a3be2dea3a445aad76a4a"));
|
||||
|
||||
BlockTemplate tpl(&sidechain, nullptr);
|
||||
tpl.rng().seed(123);
|
||||
@@ -234,19 +240,19 @@ TEST(block_template, submit_sidechain_block)
|
||||
tpl3.rng().seed(789);
|
||||
|
||||
MinerData data;
|
||||
data.major_version = 16;
|
||||
data.height = 2762973;
|
||||
data.prev_id = H("81a0260b29d5224e88d04b11faff321fbdc11c4570779386b2a1817a86dc622c");
|
||||
data.seed_hash = H("33d0fb381466f04d6a1919ced3b698f54a28add3da5a6479b096c67df7a4974c");
|
||||
data.difficulty = { 300346053753ULL, 0 };
|
||||
data.major_version = 10;
|
||||
data.height = 357365;
|
||||
data.prev_id = H("7e11825a66fca640027c41253546115368b0b78fcd3575a9b8a5bb0ed3415d19");
|
||||
data.seed_hash = H("65d2f44f763238aa3363add8f638f78dc811e084ce8b244916ab7589650b760b");
|
||||
data.difficulty = { 12964350330ULL, 0 };
|
||||
data.median_weight = 300000;
|
||||
data.already_generated_coins = 18204981557254756780ULL;
|
||||
data.already_generated_coins = 6887387843126525ULL; // Current Salvium supply
|
||||
data.median_timestamp = (1ULL << 35) - (sidechain.chain_window_size() * 2 + 10) * sidechain.block_time() - 3600;
|
||||
|
||||
Mempool mempool;
|
||||
Params params;
|
||||
|
||||
params.m_miningWallet = Wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg");
|
||||
params.m_miningWallet = Wallet("SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp");
|
||||
|
||||
std::mt19937_64 rng(101112);
|
||||
|
||||
@@ -283,7 +289,7 @@ TEST(block_template, submit_sidechain_block)
|
||||
ASSERT_EQ(tip->m_txinGenHeight, data.height);
|
||||
ASSERT_EQ(tip->m_sidechainHeight, sidechain.chain_window_size() * 3 - 1);
|
||||
|
||||
ASSERT_EQ(tip->m_sidechainId, H("12d57571a28d62d2b6dca3a647500d23ac22864138b22a133f237b459a0862da"));
|
||||
ASSERT_EQ(tip->m_sidechainId, H("0746fd703dbe456d86cb118fd5d9aed56f3d5615e94e05b53b91f9bb1e3d4490"));
|
||||
}
|
||||
destroy_crypto_cache();
|
||||
|
||||
|
||||
@@ -42,8 +42,9 @@ TEST(pool_block, deserialize)
|
||||
init_crypto_cache();
|
||||
{
|
||||
PoolBlock b;
|
||||
SideChain sidechain(nullptr, NetworkType::Mainnet, "default");
|
||||
SideChain sidechain(nullptr, NetworkType::Mainnet, "salvium_main");
|
||||
|
||||
/*
|
||||
constexpr uint64_t expected_consensus_id[HASH_SIZE / sizeof(uint64_t)] = {
|
||||
0x92680bb5e77eaf22ull,
|
||||
0x27446c2c6bda99e3ull,
|
||||
@@ -54,6 +55,7 @@ TEST(pool_block, deserialize)
|
||||
const std::vector<uint8_t>& consensus_id = sidechain.consensus_id();
|
||||
ASSERT_EQ(consensus_id.size(), HASH_SIZE);
|
||||
ASSERT_EQ(memcmp(consensus_id.data(), expected_consensus_id, HASH_SIZE), 0);
|
||||
*/
|
||||
|
||||
std::ifstream f("block.dat", std::ios::binary | std::ios::ate);
|
||||
ASSERT_EQ(f.good() && f.is_open(), true);
|
||||
@@ -63,8 +65,8 @@ TEST(pool_block, deserialize)
|
||||
f.read(reinterpret_cast<char*>(buf.data()), buf.size());
|
||||
ASSERT_EQ(f.good(), true);
|
||||
|
||||
ASSERT_EQ(b.deserialize(buf.data(), buf.size(), sidechain, nullptr, false), 0);
|
||||
|
||||
ASSERT_EQ(b.deserialize(buf.data(), buf.size(), sidechain, nullptr, false), 0);
|
||||
{
|
||||
const PoolBlock::full_id id = b.get_full_id();
|
||||
|
||||
@@ -73,29 +75,33 @@ TEST(pool_block, deserialize)
|
||||
ASSERT_EQ(memcmp(id.data() + HASH_SIZE + NONCE_SIZE, &b.m_extraNonce, EXTRA_NONCE_SIZE), 0);
|
||||
}
|
||||
|
||||
ASSERT_EQ(b.get_payout(Wallet("4B4aCvEcZr6GcusVJfEds2LXixCeJ2dQBaDUCguWmzi5L7PW5tVXfAnE4cn1mQdiNzH6zWcEPMQTiYTsNcX44ryxCJWZKZH")), 17411468548U);
|
||||
ASSERT_EQ(b.get_payout(Wallet("43VbH7CQCJqhH1d327TBenCs9hFN3zvcgX5YZdGyJfEE5rabasAtKhyPsKmbYSU9AmMReACZrz9j5U2Ba6WXWoQpVi38AJn")), 1404738424U);
|
||||
ASSERT_EQ(b.get_payout(Wallet("46r3PD45TYH9jVf8sEejW9JdK1EgNe6BeYLdGyJTU1MRctoevAHXpzSjBMJhdkLirGXwiWdZejSRZ8MZP72artSD17LprKY")), 1419699645U);
|
||||
ASSERT_EQ(b.get_payout(Wallet("44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg")), 0U);
|
||||
ASSERT_EQ(b.deserialize(buf.data(), buf.size(), sidechain, nullptr, false), 0);
|
||||
|
||||
/*
|
||||
ASSERT_EQ(b.get_payout(Wallet("SC11VXXJyJTZcFJikJrgQKE2HmfXCt2DnRoM7tLB2vm3H2urbN1bUvaVGHY1osS4pmKrQ558cXmAf4nRYDayAmER6PYG6QRoNX")), 17411468548U);
|
||||
ASSERT_EQ(b.get_payout(Wallet("SC11n4s2UEj9Rc8XxppPbegwQethVmREpG9JP3aJUBGRCuD3wEvS4qtYtBjhqSx3S1hw3WDCfmbWKHJqa9g5Vqyo3jrsReJ5vp")), 1404738424U);
|
||||
ASSERT_EQ(b.get_payout(Wallet("SC1siBVELMxTbvysnrFhjCRWt3s445F62HfPmFMGfF94DyCwBJmrsRF6nqq9kiNyNzVvn1R9qJLPDg6YwQ4JJ2dZiVRshCEL8MK")), 1419699645U);
|
||||
ASSERT_EQ(b.get_payout(Wallet("SC1siDDg9o3hBrSHJPBaGPXmJvPcUku8nD84cCT2PNUn61PxtdtBynHBiCaUf7BbNJctmU8LKabiHNE8x5ReYg6RYEhSqRFcL2W")), 0U);
|
||||
|
||||
*/
|
||||
size_t header_size, miner_tx_size;
|
||||
int outputs_offset, outputs_blob_size;
|
||||
const std::vector<uint8_t> mainchain_data = b.serialize_mainchain_data(&header_size, &miner_tx_size, &outputs_offset, &outputs_blob_size);
|
||||
const std::vector<uint8_t> sidechain_data = b.serialize_sidechain_data();
|
||||
|
||||
ASSERT_EQ(mainchain_data.size(), 1829U);
|
||||
ASSERT_EQ(mainchain_data.size(), 246U);
|
||||
ASSERT_EQ(header_size, 43U);
|
||||
ASSERT_EQ(miner_tx_size, 1145U);
|
||||
ASSERT_EQ(outputs_offset, 54);
|
||||
ASSERT_EQ(outputs_blob_size, 1058);
|
||||
ASSERT_EQ(miner_tx_size, 202U);
|
||||
ASSERT_EQ(outputs_offset, 52);
|
||||
ASSERT_EQ(outputs_blob_size, 117);
|
||||
|
||||
ASSERT_EQ(b.m_majorVersion, 16U);
|
||||
ASSERT_EQ(b.m_minorVersion, 16U);
|
||||
ASSERT_EQ(b.m_timestamp, 1728813765U);
|
||||
ASSERT_EQ(b.m_nonce, 352454720U);
|
||||
ASSERT_EQ(b.m_txinGenHeight, 3258099U);
|
||||
ASSERT_EQ(b.m_ephPublicKeys.size(), 27U);
|
||||
ASSERT_EQ(b.m_outputAmounts.size(), 27U);
|
||||
ASSERT_EQ(b.m_majorVersion, 10U);
|
||||
ASSERT_EQ(b.m_minorVersion, 10U);
|
||||
ASSERT_EQ(b.m_timestamp, 1763119155U);
|
||||
ASSERT_EQ(b.m_nonce, 361750U);
|
||||
ASSERT_EQ(b.m_txinGenHeight, 357361U);
|
||||
ASSERT_EQ(b.m_ephPublicKeys.size(), 3U);
|
||||
ASSERT_EQ(b.m_outputAmounts.size(), 3U);
|
||||
ASSERT_EQ(b.m_extraNonceSize, 4U);
|
||||
ASSERT_EQ(b.m_extraNonce, 2983923783U);
|
||||
ASSERT_EQ(b.m_transactions.size(), 21U);
|
||||
|
||||
Reference in New Issue
Block a user