txbatcher: set wanted height for future tx that has unconfirmed parent
also, do not unset it in the subsequent if statement
This commit is contained in:
@@ -450,10 +450,12 @@ class TxBatch(Logger):
|
|||||||
can_broadcast = False
|
can_broadcast = False
|
||||||
else:
|
else:
|
||||||
can_broadcast = False
|
can_broadcast = False
|
||||||
|
wanted_height = local_height + sweep_info.csv_delay
|
||||||
if base_tx and prev_height <= 0:
|
if base_tx and prev_height <= 0:
|
||||||
# we cannot add unconfirmed inputs to existing base_tx (per RBF rules)
|
# we cannot add unconfirmed inputs to existing base_tx (per RBF rules)
|
||||||
# thus, we will wait until the current batch is confirmed
|
# thus, we will wait until the current batch is confirmed
|
||||||
can_broadcast = False
|
if can_broadcast:
|
||||||
wanted_height = prev_height
|
can_broadcast = False
|
||||||
|
wanted_height = local_height + 1
|
||||||
return can_broadcast, wanted_height
|
return can_broadcast, wanted_height
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user