aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-18 22:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: trace JSON id prefixes through sendrawtx.

Browse Source 
First, merge the _ahf_ and non-ahf interfaces.
Second, remove the always-NULL txs->cmd field.

Then, add optional id_prefix for bitcoind_sendrawx, so if it's
triggered by a command (e.g. "withdraw") it's shown correctly in logs.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-09-13 06:49:11 +09:30
parent a9557d5194
commit ea7903f69a
16 changed files with 107 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lightningd/onchain_control.c
View File

@@ -348,9 +348,9 @@ static void handle_onchain_broadcast_tx(struct channel *channel,
/* If the onchaind signals this as RBF-able, then we also
* set allowhighfees, as the transaction may be RBFed into
* high feerates as protection against the MAD-HTLC attack. */
broadcast_tx_ahf(channel->peer->ld->topology, channel,
tx, is_rbf,
is_rbf ? &handle_onchain_broadcast_rbf_tx_cb : NULL);
broadcast_tx(channel->peer->ld->topology, channel,
tx, NULL, is_rbf,
is_rbf ? &handle_onchain_broadcast_rbf_tx_cb : NULL);
}
static void handle_onchain_unwatch_tx(struct channel *channel, const u8 *msg)
@@ -622,7 +622,8 @@ enum watch_result onchaind_funding_spent(struct channel *channel,
if (channel->closer != NUM_SIDES)
reason = REASON_UNKNOWN; /* will use last cause as reason */
channel_fail_permanent(channel, reason, "Funding transaction spent");
channel_fail_permanent(channel, reason,
"Funding transaction spent");
/* If we haven't posted the open event yet, post an open */
if (!channel->scid || !channel->remote_channel_ready) {