Merge pull request #1369

6d76072 simplewallet: remove double confirmation when submitting signed tx (moneromooo-monero)
92dea04 wallet2: fix wrong change being recorded for cold signed txes (moneromooo-monero)

1 files changed, 7 insertions, 1 deletions

diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h
index 23a39a85b..b6d3250b2 100644
--- a/src/wallet/wallet2.h
+++ b/src/wallet/wallet2.h
@@ -191,11 +191,12 @@ namespace tools
     {
       std::vector<cryptonote::tx_source_entry> sources;
       cryptonote::tx_destination_entry change_dts;
-      std::vector<cryptonote::tx_destination_entry> splitted_dsts;
+      std::vector<cryptonote::tx_destination_entry> splitted_dsts; // split, includes change
       std::list<size_t> selected_transfers;
       std::vector<uint8_t> extra;
       uint64_t unlock_time;
       bool use_rct;
+      std::vector<cryptonote::tx_destination_entry> dests; // original setup, does not include change
 
       BEGIN_SERIALIZE_OBJECT()
         FIELD(sources)
@@ -205,12 +206,16 @@ namespace tools
         FIELD(extra)
         VARINT_FIELD(unlock_time)
         FIELD(use_rct)
+        FIELD(dests)
       END_SERIALIZE()
     };
 
     typedef std::vector<transfer_details> transfer_container;
     typedef std::unordered_multimap<crypto::hash, payment_details> payment_container;
 
+    // The convention for destinations is:
+    // dests does not include change
+    // splitted_dsts (in construction_data) does
     struct pending_tx
     {
       cryptonote::transaction tx;
@@ -1048,6 +1053,7 @@ namespace tools
     ptx.construction_data.extra = tx.extra;
     ptx.construction_data.unlock_time = unlock_time;
     ptx.construction_data.use_rct = false;
+    ptx.construction_data.dests = dsts;
   }