From 1c4806e0d782f4d146a78600c8ad7d9e7581963b Mon Sep 17 00:00:00 2001 From: SChernykh Date: Sat, 21 Jan 2023 22:48:51 +0100 Subject: [PATCH] Fixed m_txkeySecSeed in block template update --- src/block_template.cpp | 5 +++-- src/pool_block_parser.inl | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/block_template.cpp b/src/block_template.cpp index 4139196..a026d07 100644 --- a/src/block_template.cpp +++ b/src/block_template.cpp @@ -272,8 +272,9 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, Wallet const int sidechain_version = m_poolBlockTemplate->get_sidechain_version(); if (sidechain_version <= 1) { - m_poolBlockTemplate->m_txkeySecSeed = miner_wallet->spend_public_key(); - get_tx_keys(m_poolBlockTemplate->m_txkeyPub, m_poolBlockTemplate->m_txkeySec, m_poolBlockTemplate->m_txkeySecSeed, data.prev_id); + get_tx_keys(m_poolBlockTemplate->m_txkeyPub, m_poolBlockTemplate->m_txkeySec, miner_wallet->spend_public_key(), data.prev_id); + // Both values are the same before v2 + m_poolBlockTemplate->m_txkeySecSeed = m_poolBlockTemplate->m_txkeySec; } m_poolBlockTemplate->m_minerWallet = *miner_wallet; diff --git a/src/pool_block_parser.inl b/src/pool_block_parser.inl index 3b7bdc7..aea6e4a 100644 --- a/src/pool_block_parser.inl +++ b/src/pool_block_parser.inl @@ -270,6 +270,7 @@ int PoolBlock::deserialize(const uint8_t* data, size_t size, const SideChain& si } } else { + // Both values are the same before v2 m_txkeySec = m_txkeySecSeed; // Enforce deterministic tx keys starting from v15