Merge pull request #936 from TheBlueMatt/2021-05-spendable-event-locktime-delay
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 8 Jun 2021 01:53:03 +0000 (01:53 +0000)
committerGitHub <noreply@github.com>
Tue, 8 Jun 2021 01:53:03 +0000 (01:53 +0000)
Delay DelayedPaymentOutput spendable events until the CSV delay

1  2 
lightning/src/chain/channelmonitor.rs
lightning/src/util/events.rs

Simple merge
Simple merge