Merge pull request #819 from TheBlueMatt/2021-03-810-rebased
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Wed, 3 Mar 2021 00:04:23 +0000 (16:04 -0800)
committerGitHub <noreply@github.com>
Wed, 3 Mar 2021 00:04:23 +0000 (16:04 -0800)
Change ChannelManager deserialization to return an optional blockhash

1  2 
lightning-block-sync/src/init.rs
lightning/src/ln/channelmanager.rs

Simple merge
Simple merge