Merge pull request #1107 from dunxen/2021-10-swap-pubkey-for-bytearray