diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-11-01 15:12:30 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-11-01 15:12:30 +0200 |
| commit | f189fe51ac90f6e9ddbbea6f2cb7555f44572ecc (patch) | |
| tree | e19da4bb9c840b2d8670ef2997f2653c2e05224a /src/cryptonote_core | |
| parent | d53bc2eddf8da0b2fc88728922c0cfef2eab1bbf (diff) | |
| parent | f5ccfa4001f8c6a04c3648f35a0980ffd47526e7 (diff) | |
| download | monzero-core-f189fe51ac90f6e9ddbbea6f2cb7555f44572ecc.tar.gz monzero-core-f189fe51ac90f6e9ddbbea6f2cb7555f44572ecc.tar.xz monzero-core-f189fe51ac90f6e9ddbbea6f2cb7555f44572ecc.zip | |
Merge pull request #1282
f5ccfa4 core: fix removal of extra nonce using wrong type (moneromooo-monero)
3c2cad2 Revert "remove cn_deserialize" (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/cryptonote_format_utils.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp index 870e8f0d8..6d64a43cb 100644 --- a/src/cryptonote_core/cryptonote_format_utils.cpp +++ b/src/cryptonote_core/cryptonote_format_utils.cpp @@ -509,7 +509,7 @@ namespace cryptonote std::string extra_nonce; set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id); - remove_field_from_tx_extra(tx.extra, typeid(tx_extra_fields)); + remove_field_from_tx_extra(tx.extra, typeid(tx_extra_nonce)); if (!add_extra_nonce_to_tx_extra(tx.extra, extra_nonce)) { LOG_ERROR("Failed to add encrypted payment id to tx extra"); |