From 8bd716777e54850cee02cd5c828d9807001ec8c3 Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Wed, 26 Dec 2018 15:52:33 +0000 Subject: [PATCH] simplewallet: remove ability to transfer with detached short payment ids It seemed like a good idea at the time --- src/simplewallet/simplewallet.cpp | 33 ++----------------------------- 1 file changed, 2 insertions(+), 31 deletions(-) diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 281702774..bd48ad7e4 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -5133,19 +5133,6 @@ bool simple_wallet::transfer_main(int transfer_type, const std::vector &args_) { set_payment_id_to_tx_extra_nonce(extra_nonce, payment_id); } - else if(tools::wallet2::parse_short_payment_id(local_args.back(), payment_id8)) - { - set_encrypted_payment_id_to_tx_extra_nonce(extra_nonce, payment_id8); - } else { fail_msg_writer() << tr("failed to parse Payment ID"); @@ -8055,8 +8026,8 @@ bool simple_wallet::address_book(const std::vector &args/* = std::v } else if (tools::wallet2::parse_short_payment_id(args[3], info.payment_id)) { - memcpy(payment_id.data, info.payment_id.data, 8); - description_start += 2; + fail_msg_writer() << tr("Short payment IDs are to be used within an integrated address only"); + return true; } else {