[Wallet] unset change position when there is no change on exact match

bitcoin · 18476423fba5d2cadd2b0973e425a6ebedeb66a4 · instagibbs committed with jonasschnelli Apr 28, 2017

This commit was signed with a verified signature.

jonasschnelli Jonas Schnelli

GPG key ID: 1EB776BB03C7922D Learn about signing commits · Apr 28, 2017 · 1847642
1 parent ae479bc
commit 18476423fba5d2cadd2b0973e425a6ebedeb66a4
Unified Split

Showing with 8 additions and 2 deletions.

+5 −0 qa/rpc-tests/fundrawtransaction.py

+3 −2 src/wallet/wallet.cpp
diff --git a/qa/rpc-tests/fundrawtransaction.py b/qa/rpc-tests/fundrawtransaction.py
@@ -54,6 +54,11 @@ def run_test(self):
         self.nodes[0].generate(121)
         self.sync_all()
 
+        # ensure that setting changePosition in fundraw with an exact match is handled properly
+        rawmatch = self.nodes[2].createrawtransaction([], {self.nodes[2].getnewaddress():50})
+        rawmatch = self.nodes[2].fundrawtransaction(rawmatch, {"changePosition":1, "subtractFeeFromOutputs":[0]})
+        assert_equal(rawmatch["changepos"], -1)
+
         watchonly_address = self.nodes[0].getnewaddress()
         watchonly_pubkey = self.nodes[0].validateaddress(watchonly_address)["pubkey"]
         watchonly_amount = Decimal(200)
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2587,9 +2587,10 @@ bool CWallet::CreateTransaction(const vector<CRecipient>& vecSend, CWalletTx& wt
                         vector<CTxOut>::iterator position = txNew.vout.begin()+nChangePosInOut;
                         txNew.vout.insert(position, newTxOut);
                     }
-                }
-                else
+                } else {
                     reservekey.ReturnKey();
+                    nChangePosInOut = -1;
+                }
 
                 // Fill vin
                 //