refactor: p2pk and htlc conditions#809

callebtc wants to merge 2 commits intomaincashubtc/nutshell:mainfrom

refactor-htlc-p2pkcashubtc/nutshell:refactor-htlc-p2pkCopy head branch name to clipboard