Merge pull request bitcoinjs#1884 from jafri/master

Handle custom signature hash type - sig length

Author: junderw

src/payments/p2tr.js

@@ -31,7 +31,12 @@ function p2tr(a, opts) {
       internalPubkey: types_1.typeforce.maybe(types_1.typeforce.BufferN(32)),
       hash: types_1.typeforce.maybe(types_1.typeforce.BufferN(32)),
       pubkey: types_1.typeforce.maybe(types_1.typeforce.BufferN(32)),
-      signature: types_1.typeforce.maybe(types_1.typeforce.BufferN(64)),
+      signature: types_1.typeforce.maybe(
+        types_1.typeforce.anyOf(
+          types_1.typeforce.BufferN(64),
+          types_1.typeforce.BufferN(65),
+        ),
+      ),
       witness: types_1.typeforce.maybe(
         types_1.typeforce.arrayOf(types_1.typeforce.Buffer),
       ),

test/fixtures/psbt.json

@@ -767,6 +767,19 @@
           "WIF": "KxnAnQh6UJBxLF8Weup77yn8tWhLHhDhnXeyJuzmmcZA5aRdMJni"
         }
       },
+      {
+        "description": "checks taproot signing works when using custom signature type of 65 bytes",
+        "isTaproot": true,
+        "shouldSign": {
+          "psbt": "cHNidP8BAF4CAAAAAf17fGksrz9eKGx1nSU3RX4vcwr7bfNdQzPZ9dSEkWBcAAAAAAD/////AZBBBgAAAAAAIlEgPLBe/d3922lmXjTIt52b9NG1HFDC9jzPCTn111AG8TQAAAAAAAEBK6BoBgAAAAAAIlEgPLBe/d3922lmXjTIt52b9NG1HFDC9jzPCTn111AG8TQBAwSDAAAAARcgWzC4qnD37J3WaDEbZPRihBXdI0gN68BGutJykDcHR6wBGCDlDrX1cnzwZvmcyLBH8M6NiS9lk7JVwM58wZZVOzmuMwAA",
+          "sighashTypes": [
+            131
+          ],
+          "inputToCheck": 0,
+          "WIF": "KypUz2y1jdgzM8HGDUx9DYLmyzd8EWhruvLX2J5iSL7MiAcc7dBG",
+          "result": "cHNidP8BAF4CAAAAAf17fGksrz9eKGx1nSU3RX4vcwr7bfNdQzPZ9dSEkWBcAAAAAAD/////AZBBBgAAAAAAIlEgPLBe/d3922lmXjTIt52b9NG1HFDC9jzPCTn111AG8TQAAAAAAAEBK6BoBgAAAAAAIlEgPLBe/d3922lmXjTIt52b9NG1HFDC9jzPCTn111AG8TQBAwSDAAAAARNBqgjqjSQVTf41zgZ1H9Lq3CKQt0nq1APST8FpwGifNjyUHMS0MbFnIxA70SXTEOoSJePyOXTW+u59fzLpxekL2oMBFyBbMLiqcPfsndZoMRtk9GKEFd0jSA3rwEa60nKQNwdHrAEYIOUOtfVyfPBm+ZzIsEfwzo2JL2WTslXAznzBllU7Oa4zAAA="
+        }
+      },
       {
         "description": "checks taproot key-path signer (tweaked key) matches internal tap key",
         "isTaproot": true,
@@ -908,4 +921,4 @@
   "clone": {
     "psbt": "cHNidP8BAKYCAAAAAlwKQ3suPWwEJ/zQ9sZsIioOcHKU1KoLMxlMNSXVIkEWAAAAAAD/////YYDJMap+mYgbTrCNAdpWHN+EkKvl+XYao/6co/EQfwMAAAAAAP////8CkF8BAAAAAAAWABRnPBAmVHz2HL+8/1U+QG5L2thjmjhKAAAAAAAAIgAg700yfFRyhWzQnPHIUb/XQqsjlpf4A0uw682pCVWuQ8IAAAAAAAEBKzB1AAAAAAAAIgAgth9oE4cDfC5aV58VgkW5CptHsIxppYzJV8C5kT6aTo8iAgNfNgnFnEPS9s4PY/I5bezpWiAEzQ4DRTASgdSdeMM06UgwRQIhALO0xRpuqP3aVkm+DPykrtqe6fPNSgNblp9K9MAwmtHJAiAHV5ZvZN8Vi49n/o9ISFyvtHsPXXPKqBxC9m2m2HlpYgEBBSMhA182CcWcQ9L2zg9j8jlt7OlaIATNDgNFMBKB1J14wzTprAABASuAOAEAAAAAACIAILYfaBOHA3wuWlefFYJFuQqbR7CMaaWMyVfAuZE+mk6PIgIDXzYJxZxD0vbOD2PyOW3s6VogBM0OA0UwEoHUnXjDNOlIMEUCIQC6XN6tpo9mYlZej4BXSSh5D1K6aILBfQ4WBWXUrISx6wIgVaxFUsz8y59xJ1V4sZ1qarHX9pZ+MJmLKbl2ZSadisoBAQUjIQNfNgnFnEPS9s4PY/I5bezpWiAEzQ4DRTASgdSdeMM06awAAAA="
   }
-}
+}

ts_src/payments/p2tr.ts

@@ -40,7 +40,7 @@ export function p2tr(a: Payment, opts?: PaymentOpts): Payment {
       internalPubkey: typef.maybe(typef.BufferN(32)),
       hash: typef.maybe(typef.BufferN(32)), // merkle root hash, the tweak
       pubkey: typef.maybe(typef.BufferN(32)), // tweaked with `hash` from `internalPubkey`
-      signature: typef.maybe(typef.BufferN(64)),
+      signature: typef.maybe(typef.anyOf(typef.BufferN(64), typef.BufferN(65))),
       witness: typef.maybe(typef.arrayOf(typef.Buffer)),
       scriptTree: typef.maybe(isTaptree),
       redeem: typef.maybe({