X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fwallet.cpp;h=a662111d4948428c62d2a314c3343d834da77ab6;hb=bf798734db4539a39edd6badf54a1c3aecf193e5;hp=87f5dfd659fb47f5d0636ed7d2b70ba5a5c37b1f;hpb=1466b8b78ad8cabf93ac3f65f5929213c5dd3c8f;p=novacoin.git

diff --git a/src/wallet.cpp b/src/wallet.cpp
index 87f5dfd..a662111 100644
--- a/src/wallet.cpp
+++ b/src/wallet.cpp
@@ -997,12 +997,11 @@ bool CWallet::CreateTransaction(const vector<pair<CScript, int64> >& vecSend, CW
                     vector<unsigned char> vchPubKey = reservekey.GetReservedKey();
                     // assert(mapKeys.count(vchPubKey));
 
-                    // Fill a vout to ourself, using same address type as the payment
+                    // Fill a vout to ourself
+                    // TODO: pass in scriptChange instead of reservekey so
+                    // change transaction isn't always pay-to-bitcoin-address
                     CScript scriptChange;
-                    if (vecSend[0].first.GetBitcoinAddress().IsValid())
-                        scriptChange.SetBitcoinAddress(vchPubKey);
-                    else
-                        scriptChange << vchPubKey << OP_CHECKSIG;
+                    scriptChange.SetBitcoinAddress(vchPubKey);
 
                     // Insert change txn at random position:
                     vector<CTxOut>::iterator position = wtxNew.vout.begin()+GetRandInt(wtxNew.vout.size());