Merge pull request #1039 from lightning-signer/2021-08-more-enforcement