mirror of
https://github.com/ElementsProject/lightning.git
synced 2025-03-26 20:30:59 +01:00
wallet: allow to withdraw with unconfirmed utxos
Changelog-Fixed: Passing 0 as minconf to withdraw allows you to use unconfirmed transaction outputs, even if explicitly passed as the `utxos` parameter
This commit is contained in:
parent
13fbce90ca
commit
eead65350f
2 changed files with 8 additions and 1 deletions
|
@ -205,7 +205,8 @@ struct command_result *wtx_from_utxos(struct wallet_tx *tx,
|
|||
/* + segwit marker + flag */
|
||||
weight = 4 * (4 + 1 + 1 + 4) + 4 * (8 + 1 + out_len) + 1 + 1;
|
||||
for (size_t i = 0; i < tal_count(utxos); i++) {
|
||||
if (!utxos[i]->blockheight || *utxos[i]->blockheight > maxheight) {
|
||||
if (maxheight > 0 &&
|
||||
(!utxos[i]->blockheight || *utxos[i]->blockheight > maxheight)) {
|
||||
tal_arr_remove(&utxos, i);
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -165,6 +165,12 @@ def test_withdraw(node_factory, bitcoind):
|
|||
for utxo in utxos:
|
||||
assert utxo in vins
|
||||
|
||||
# Try passing unconfirmed utxos
|
||||
unconfirmed_utxos = [l1.rpc.withdraw(l1.rpc.newaddr()["bech32"], 10**5)
|
||||
for _ in range(5)]
|
||||
uutxos = [u["txid"] + ":0" for u in unconfirmed_utxos]
|
||||
l1.rpc.withdraw(waddr, "all", minconf=0, utxos=uutxos)
|
||||
|
||||
|
||||
def test_minconf_withdraw(node_factory, bitcoind):
|
||||
"""Issue 2518: ensure that ridiculous confirmation levels don't overflow
|
||||
|
|
Loading…
Add table
Reference in a new issue