davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

closingd: add notifications for feerate ranges.

Browse Source 
This allows cmdline users to have more idea what's going on.

Inspired-by: https://github.com/ElementsProject/lightning/issues/4777
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: `close` now notifies about the feeranges each side uses.
This commit is contained in:
Rusty Russell
2021-09-15 10:30:14 +09:30
committed by Christian Decker
parent 789b330338
commit d970cc070e
6 changed files with 116 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
closingd/closingd.c
View File

@@ -32,6 +32,20 @@
#define REQ_FD STDIN_FILENO
#define HSM_FD 6
static void notify(enum log_level level, const char *fmt, ...)
{
va_list ap;
va_start(ap, fmt);
wire_sync_write(REQ_FD,
take(towire_closingd_notification(NULL,
level,
tal_vfmt(tmpctx, fmt,
ap))));
va_end(ap);
}
static struct bitcoin_tx *close_tx(const tal_t *ctx,
const struct chainparams *chainparams,
struct per_peer_state *pps,
@@ -192,6 +206,10 @@ static void send_offer(struct per_peer_state *pps,
close_tlvs->fee_range
= cast_const(struct tlv_closing_signed_tlvs_fee_range *,
tlv_fees);
notify(LOG_INFORM, "Sending closing fee offer %s, with range %s-%s",
type_to_string(tmpctx, struct amount_sat, &fee_to_offer),
type_to_string(tmpctx, struct amount_sat, &tlv_fees->min_fee_satoshis),
type_to_string(tmpctx, struct amount_sat, &tlv_fees->max_fee_satoshis));
} else
close_tlvs = NULL;
@@ -345,10 +363,23 @@ receive_offer(struct per_peer_state *pps,
type_to_string(tmpctx, struct amount_sat, &received_fee));
if (tlv_fees) {
if (close_tlvs)
if (close_tlvs) {
*tlv_fees = tal_steal(tlv_fees, close_tlvs->fee_range);
else
} else {
*tlv_fees = NULL;
}
}
if (close_tlvs && close_tlvs->fee_range) {
notify(LOG_INFORM, "Received closing fee offer %s, with range %s-%s",
type_to_string(tmpctx, struct amount_sat, &received_fee),
type_to_string(tmpctx, struct amount_sat,
&close_tlvs->fee_range->min_fee_satoshis),
type_to_string(tmpctx, struct amount_sat,
&close_tlvs->fee_range->max_fee_satoshis));
} else {
notify(LOG_INFORM, "Received closing fee offer %s, without range",
type_to_string(tmpctx, struct amount_sat, &received_fee));
}
/* Master sorts out what is best offer, we just tell it any above min */
@@ -1080,4 +1111,5 @@ exit_thru_the_giftshop:
daemon_shutdown();
return 0;
}

6
closingd/closingd_wire.csv
View File

@@ -3,6 +3,7 @@
#include <common/cryptomsg.h>
#include <common/htlc_wire.h>
#include <common/per_peer_state.h>
#include <common/status_wire.h>
# Begin! (passes peer fd, gossipd-client fd)
msgtype,closingd_init,2001
msgdata,closingd_init,chainparams,chainparams,
@@ -31,6 +32,11 @@ msgdata,closingd_init,use_quickclose,bool,
msgdata,closingd_init,dev_fast_gossip,bool,
msgdata,closingd_init,shutdown_wrong_funding,?bitcoin_outpoint,
# Message for any commands waiting.
msgtype,closingd_notification,2003
msgdata,closingd_notification,level,enum log_level,
msgdata,closingd_notification,message,wirestring,
# We received an offer, save signature.
msgtype,closingd_received_signature,2002
msgdata,closingd_received_signature,signature,bitcoin_signature,
1 #include <bitcoin/tx.h>
3 #include <common/cryptomsg.h>
4 #include <common/htlc_wire.h>
5 #include <common/per_peer_state.h>
6 #include <common/status_wire.h>
7 # Begin! (passes peer fd, gossipd-client fd)
8 msgtype,closingd_init,2001
9 msgdata,closingd_init,chainparams,chainparams,
32 msgdata,closingd_init,dev_fast_gossip,bool,
33 msgdata,closingd_init,shutdown_wrong_funding,?bitcoin_outpoint,
34 # We received an offer, save signature. # Message for any commands waiting.
35 msgtype,closingd_notification,2003
36 msgdata,closingd_notification,level,enum log_level,
37 msgdata,closingd_notification,message,wirestring,
38 # We received an offer, save signature.
39 msgtype,closingd_received_signature,2002
40 msgtype,closingd_received_signature,2002 msgdata,closingd_received_signature,signature,bitcoin_signature,
41 msgdata,closingd_received_signature,signature,bitcoin_signature, msgdata,closingd_received_signature,tx,bitcoin_tx,
42 msgdata,closingd_received_signature,tx,bitcoin_tx, msgtype,closingd_received_signature_reply,2102

28
closingd/closingd_wiregen.c generated
View File

@@ -21,6 +21,7 @@ const char *closingd_wire_name(int e)
switch ((enum closingd_wire)e) {
case WIRE_CLOSINGD_INIT: return "WIRE_CLOSINGD_INIT";
case WIRE_CLOSINGD_NOTIFICATION: return "WIRE_CLOSINGD_NOTIFICATION";
case WIRE_CLOSINGD_RECEIVED_SIGNATURE: return "WIRE_CLOSINGD_RECEIVED_SIGNATURE";
case WIRE_CLOSINGD_RECEIVED_SIGNATURE_REPLY: return "WIRE_CLOSINGD_RECEIVED_SIGNATURE_REPLY";
case WIRE_CLOSINGD_COMPLETE: return "WIRE_CLOSINGD_COMPLETE";
@@ -34,6 +35,7 @@ bool closingd_wire_is_defined(u16 type)
{
switch ((enum closingd_wire)type) {
case WIRE_CLOSINGD_INIT:;
case WIRE_CLOSINGD_NOTIFICATION:;
case WIRE_CLOSINGD_RECEIVED_SIGNATURE:;
case WIRE_CLOSINGD_RECEIVED_SIGNATURE_REPLY:;
case WIRE_CLOSINGD_COMPLETE:;
@@ -145,6 +147,30 @@ bool fromwire_closingd_init(const tal_t *ctx, const void *p, const struct chainp
return cursor != NULL;
}
/* WIRE: CLOSINGD_NOTIFICATION */
/* Message for any commands waiting. */
u8 *towire_closingd_notification(const tal_t *ctx, enum log_level level, const wirestring *message)
{
u8 *p = tal_arr(ctx, u8, 0);
towire_u16(&p, WIRE_CLOSINGD_NOTIFICATION);
towire_log_level(&p, level);
towire_wirestring(&p, message);
return memcheck(p, tal_count(p));
}
bool fromwire_closingd_notification(const tal_t *ctx, const void *p, enum log_level *level, wirestring **message)
{
const u8 *cursor = p;
size_t plen = tal_count(p);
if (fromwire_u16(&cursor, &plen) != WIRE_CLOSINGD_NOTIFICATION)
return false;
*level = fromwire_log_level(&cursor, &plen);
*message = fromwire_wirestring(ctx, &cursor, &plen);
return cursor != NULL;
}
/* WIRE: CLOSINGD_RECEIVED_SIGNATURE */
/* We received an offer */
u8 *towire_closingd_received_signature(const tal_t *ctx, const struct bitcoin_signature *signature, const struct bitcoin_tx *tx)
@@ -209,4 +235,4 @@ bool fromwire_closingd_complete(const void *p)
return false;
return cursor != NULL;
}
// SHA256STAMP:0d0d56c4ec5230461ead5cfac728e57e75db7bff1b53b1b0aaef20b82ce76362
// SHA256STAMP:0602a002b81e43b45a8c40a15cb4af6c5e7ea66d6f95b7ba89f386b2fe73bd0e

10
closingd/closingd_wiregen.h generated
View File

@@ -12,10 +12,13 @@
#include <common/cryptomsg.h>
#include <common/htlc_wire.h>
#include <common/per_peer_state.h>
#include <common/status_wire.h>
enum closingd_wire {
/* Begin! (passes peer fd */
WIRE_CLOSINGD_INIT = 2001,
/* Message for any commands waiting. */
WIRE_CLOSINGD_NOTIFICATION = 2003,
/* We received an offer */
WIRE_CLOSINGD_RECEIVED_SIGNATURE = 2002,
WIRE_CLOSINGD_RECEIVED_SIGNATURE_REPLY = 2102,
@@ -40,6 +43,11 @@ bool closingd_wire_is_defined(u16 type);
u8 *towire_closingd_init(const tal_t *ctx, const struct chainparams *chainparams, const struct per_peer_state *pps, const struct channel_id *channel_id, const struct bitcoin_txid *funding_txid, u16 funding_txout, struct amount_sat funding_satoshi, const struct pubkey *local_fundingkey, const struct pubkey *remote_fundingkey, enum side opener, struct amount_sat local_sat, struct amount_sat remote_sat, struct amount_sat our_dust_limit, u32 min_feerate_perksipa, u32 preferred_feerate_perksipa, u32 *max_feerate_perksipa, struct amount_sat fee_limit_satoshi, const u8 *local_scriptpubkey, const u8 *remote_scriptpubkey, u64 fee_negotiation_step, u8 fee_negotiation_step_unit, bool use_quickclose, bool dev_fast_gossip, const struct bitcoin_outpoint *shutdown_wrong_funding);
bool fromwire_closingd_init(const tal_t *ctx, const void *p, const struct chainparams **chainparams, struct per_peer_state **pps, struct channel_id *channel_id, struct bitcoin_txid *funding_txid, u16 *funding_txout, struct amount_sat *funding_satoshi, struct pubkey *local_fundingkey, struct pubkey *remote_fundingkey, enum side *opener, struct amount_sat *local_sat, struct amount_sat *remote_sat, struct amount_sat *our_dust_limit, u32 *min_feerate_perksipa, u32 *preferred_feerate_perksipa, u32 **max_feerate_perksipa, struct amount_sat *fee_limit_satoshi, u8 **local_scriptpubkey, u8 **remote_scriptpubkey, u64 *fee_negotiation_step, u8 *fee_negotiation_step_unit, bool *use_quickclose, bool *dev_fast_gossip, struct bitcoin_outpoint **shutdown_wrong_funding);
/* WIRE: CLOSINGD_NOTIFICATION */
/* Message for any commands waiting. */
u8 *towire_closingd_notification(const tal_t *ctx, enum log_level level, const wirestring *message);
bool fromwire_closingd_notification(const tal_t *ctx, const void *p, enum log_level *level, wirestring **message);
/* WIRE: CLOSINGD_RECEIVED_SIGNATURE */
/* We received an offer */
u8 *towire_closingd_received_signature(const tal_t *ctx, const struct bitcoin_signature *signature, const struct bitcoin_tx *tx);
@@ -56,4 +64,4 @@ bool fromwire_closingd_complete(const void *p);
#endif /* LIGHTNING_CLOSINGD_CLOSINGD_WIREGEN_H */
// SHA256STAMP:0d0d56c4ec5230461ead5cfac728e57e75db7bff1b53b1b0aaef20b82ce76362
// SHA256STAMP:0602a002b81e43b45a8c40a15cb4af6c5e7ea66d6f95b7ba89f386b2fe73bd0e