aboutsummaryrefslogtreecommitdiff
path: root/src/cryptonote_core
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-11-14 19:05:52 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2016-11-15 21:20:02 +0000
commit23d80b15fdb99819ea12ae94b1223d6972de70c8 (patch)
treec8cb7a8dbfdeeb3277a03239f1d4850b8e1b361f /src/cryptonote_core
parentsimplewallet: add a verbose flag to incoming_transfers (diff)
downloadmonero-23d80b15fdb99819ea12ae94b1223d6972de70c8.tar.xz
core: remove any tx pubkey from extra before adding one
This will happen when signing a transaction from a cold wallet, and we don't want the placeholder the hot wallet put in it.
Diffstat (limited to 'src/cryptonote_core')
-rw-r--r--src/cryptonote_core/cryptonote_format_utils.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/cryptonote_core/cryptonote_format_utils.cpp b/src/cryptonote_core/cryptonote_format_utils.cpp
index 234422e3d..d88f66e3b 100644
--- a/src/cryptonote_core/cryptonote_format_utils.cpp
+++ b/src/cryptonote_core/cryptonote_format_utils.cpp
@@ -480,6 +480,7 @@ namespace cryptonote
tx.extra = extra;
keypair txkey = keypair::generate();
+ remove_field_from_tx_extra(tx.extra, typeid(tx_extra_pub_key));
add_tx_pub_key_to_extra(tx, txkey.pub);
tx_key = txkey.sec;