diff --git a/Makefile b/Makefile index 6c8a99fef..2bbfe8894 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ CCANDIR := ccan # Where we keep the BOLT RFCs BOLTDIR := ../bolts/ -DEFAULT_BOLTVERSION := 2ecc091f3484f7a3450e7f5543ae851edd1e0761 +DEFAULT_BOLTVERSION := 341ec844f13c0c0abc4fe849059fbb98173f9766 # Can be overridden on cmdline. BOLTVERSION := $(DEFAULT_BOLTVERSION) diff --git a/channeld/channeld.c b/channeld/channeld.c index 541f9460c..c4f2a744d 100644 --- a/channeld/channeld.c +++ b/channeld/channeld.c @@ -1254,8 +1254,9 @@ static void send_commit(struct peer *peer) /* BOLT #2: * - * - if no HTLCs remain in either commitment transaction: - * - MUST NOT send any `update` message after a `shutdown`. + * - if no HTLCs remain in either commitment transaction (including dust HTLCs) + * and neither side has a pending `revoke_and_ack` to send: + * - MUST NOT send any `update` message after that point. */ if (peer->shutdown_sent[LOCAL] && !num_channel_htlcs(peer->channel)) { status_debug("Can't send commit: final shutdown phase");