mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-12-06 18:53:21 +01:00
Do not allow users to get keys from keypool without reserving them
fundrawtransaction allows users to add a change output and then not have it removed from keypool. While it would be nice to have users follow the normal CreateTransaction/CommitTransaction process we use internally, there isnt much benefit in exposing this option, especially with HD wallets, while there is ample room for users to misunderstand or misuse this option. This could be particularly nasty in some use-cases (especially pre-HD-split) - eg a user might fundrawtransaction, then call getnewaddress, hand out the address for someone to pay them, then sendrawtransaction. This may result in the user thinking they have received payment, even though it was really just their own change! This could obviously result in needless key-reuse.
This commit is contained in:
@@ -636,20 +636,9 @@ class RawTransactionsTest(BitcoinTestFramework):
|
||||
assert_fee_amount(result2['fee'], count_bytes(result2['hex']), 2 * result_fee_rate)
|
||||
assert_fee_amount(result3['fee'], count_bytes(result3['hex']), 10 * result_fee_rate)
|
||||
|
||||
#############################
|
||||
# Test address reuse option #
|
||||
#############################
|
||||
|
||||
result3 = self.nodes[3].fundrawtransaction(rawtx, {"reserveChangeKey": False})
|
||||
res_dec = self.nodes[0].decoderawtransaction(result3["hex"])
|
||||
changeaddress = ""
|
||||
for out in res_dec['vout']:
|
||||
if out['value'] > 1.0:
|
||||
changeaddress += out['scriptPubKey']['addresses'][0]
|
||||
assert(changeaddress != "")
|
||||
nextaddr = self.nodes[3].getrawchangeaddress()
|
||||
# frt should not have removed the key from the keypool
|
||||
assert(changeaddress == nextaddr)
|
||||
################################
|
||||
# Test no address reuse occurs #
|
||||
################################
|
||||
|
||||
result3 = self.nodes[3].fundrawtransaction(rawtx)
|
||||
res_dec = self.nodes[0].decoderawtransaction(result3["hex"])
|
||||
|
||||
Reference in New Issue
Block a user