GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fundrawtransaction needs to push back all outputs

Browse source
This commit is contained in:
Gregory Sanders 2017-07-18 14:42:10 -04:00
parent 28c66dcb44
commit 5f254c2ab9
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
qa/rpc-tests/confidential_transactions.py
View file

@ -185,6 +185,9 @@ class CTTest (BitcoinTestFramework):
blinded = self.nodes[0].blindrawtransaction(funded["hex"])
# blind again to make sure we know output blinders
blinded2 = self.nodes[0].blindrawtransaction(blinded)
# then sign and send
signed = self.nodes[0].signrawtransaction(blinded2)
self.nodes[0].sendrawtransaction(signed["hex"])
# Check createblindedaddress functionality
blinded_addr = self.nodes[0].getnewaddress()
@ -399,7 +402,7 @@ class CTTest (BitcoinTestFramework):
txid1 = self.nodes[0].sendtoaddress(blinded_addr, 1)
txid2 = self.nodes[0].sendtoaddress(blinded_addr, 3)
unspent = self.nodes[0].listunspent(0, 0)
assert_equal(len(unspent), 3)
assert_equal(len(unspent), 4)
rawtx = self.nodes[0].createrawtransaction([{"txid":unspent[0]["txid"], "vout":unspent[0]["vout"]}, {"txid":unspent[1]["txid"], "vout":unspent[1]["vout"]}], {addr:unspent[0]["amount"]+unspent[1]["amount"]-Decimal("0.2"), "fee":Decimal("0.2")})
# Blinding will fail with 2 blinded inputs and 0 blinded outputs
# since it has no notion of a wallet to fill in a 0-value OP_RETURN output

2
src/wallet/wallet.cpp
View file

@ -2657,7 +2657,7 @@ bool CWallet::FundTransaction(CMutableTransaction& tx, CAmount& nFeeRet, bool ov
const CTxOut& out = wtx.tx->vout[i];
tx.vout.push_back(out);
if (wtx.tx->wit.vtxoutwit.size() <= i) {
break;
continue;
}
// We want to re-add previously existing outwitnesses
// even though we don't create any new ones