diff options
| author | Crypto City <cryptocity@example.com> | 2023-11-12 11:33:20 +0000 |
|---|---|---|
| committer | moneromooo-monero <moneromooo-monero@users.noreply.github.com> | 2023-11-30 17:01:52 +0000 |
| commit | 53e632b435582193d4a708e2b7cf0bfc01ae821b (patch) | |
| tree | 7a4b79bf488284a743124a0d25dd025e55d2dc61 /src/cryptonote_basic/cryptonote_format_utils.h | |
| parent | Merge pull request #9050 (diff) | |
| download | monero-53e632b435582193d4a708e2b7cf0bfc01ae821b.tar.xz | |
fix merge mining with more than one merge mined chain
reported by sech1
Diffstat (limited to 'src/cryptonote_basic/cryptonote_format_utils.h')
| -rw-r--r-- | src/cryptonote_basic/cryptonote_format_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_basic/cryptonote_format_utils.h b/src/cryptonote_basic/cryptonote_format_utils.h index 33fec238e..bd4dcd83d 100644 --- a/src/cryptonote_basic/cryptonote_format_utils.h +++ b/src/cryptonote_basic/cryptonote_format_utils.h @@ -83,7 +83,7 @@ namespace cryptonote std::vector<crypto::public_key> get_additional_tx_pub_keys_from_extra(const transaction_prefix& tx); bool add_additional_tx_pub_keys_to_extra(std::vector<uint8_t>& tx_extra, const std::vector<crypto::public_key>& additional_pub_keys); bool add_extra_nonce_to_tx_extra(std::vector<uint8_t>& tx_extra, const blobdata& extra_nonce); - bool add_mm_merkle_root_to_tx_extra(std::vector<uint8_t>& tx_extra, const crypto::hash& mm_merkle_root, size_t mm_merkle_tree_depth); + bool add_mm_merkle_root_to_tx_extra(std::vector<uint8_t>& tx_extra, const crypto::hash& mm_merkle_root, uint64_t mm_merkle_tree_depth); bool remove_field_from_tx_extra(std::vector<uint8_t>& tx_extra, const std::type_info &type); void set_payment_id_to_tx_extra_nonce(blobdata& extra_nonce, const crypto::hash& payment_id); void set_encrypted_payment_id_to_tx_extra_nonce(blobdata& extra_nonce, const crypto::hash8& payment_id); |