Browse Source

Merge #10294: [Wallet] unset change position when there is no change

7c58863 [Wallet] unset change position when there is no change on exact match (Gregory Sanders)

Tree-SHA512: ce8b9337e4132e32d80f954258d50938052c833a48e39431649d6adb16e3d18626a0ae5d300827e7fa397927fba72a1f066cb31af9b0a3ef7f1feb6024461626
tags/v0.15.1
Wladimir J. van der Laan 4 years ago
parent
commit
e2b99b1313
No account linked to committer's email address
2 changed files with 8 additions and 2 deletions
  1. 3
    2
      src/wallet/wallet.cpp
  2. 5
    0
      test/functional/fundrawtransaction.py

+ 3
- 2
src/wallet/wallet.cpp View File

@@ -2563,9 +2563,10 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CWalletT
std::vector<CTxOut>::iterator position = txNew.vout.begin()+nChangePosInOut;
txNew.vout.insert(position, newTxOut);
}
}
else
} else {
reservekey.ReturnKey();
nChangePosInOut = -1;
}

// Fill vin
//

+ 5
- 0
test/functional/fundrawtransaction.py View File

@@ -53,6 +53,11 @@ class RawTransactionsTest(BitcoinTestFramework):
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)

Loading…
Cancel
Save