feat: allow passing in tapLeafHashToSign when calling signPsbt

Author: slient-coder

package.json

@@ -25,6 +25,7 @@
     "_prettier": "prettier --write .",
     "fix:modules": "node scripts/fix-modules.js",
     "format": "prettier --write \"src/**/*.{js,jsx,json,md,ts,tsx}\" --plugin-search-dir=./node_modules/ --plugin=./node_modules/@trivago/prettier-plugin-sort-imports/ ",
+    "postinstall": "patch-package",
     "prepare": "npm run fix:modules"
   },
   "dependencies": {
@@ -52,7 +53,7 @@
     "@types/react": "^18.0.9",
     "@types/react-cache": "^2.0.1",
     "@types/react-dom": "^18.0.4",
-    "@unisat/wallet-sdk": "1.7.1",
+    "@unisat/wallet-sdk": "1.7.3",
     "antd": "^4.20.4",
     "antd-dayjs-webpack-plugin": "1.0.6",
     "assert": "^2.0.0",
@@ -248,6 +249,8 @@
     "less": "^4.1.2",
     "less-loader": "^11.0.0",
     "minimist": "^1.2.6",
+    "patch-package": "^8.0.0",
+    "postinstall": "^0.11.0",
     "prettier": "^2.6.2",
     "sass-loader": "^12.6.0",
     "stylus": "^0.57.0",

patches/bitcoinjs-lib+6.1.6.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/bitcoinjs-lib/src/psbt.js b/node_modules/bitcoinjs-lib/src/psbt.js
+index b071f37..1eded75 100644
+--- a/node_modules/bitcoinjs-lib/src/psbt.js
++++ b/node_modules/bitcoinjs-lib/src/psbt.js
+@@ -1342,7 +1342,7 @@ function getTaprootHashesForSig(
+     }
+   }
+   const tapLeafHashes = (input.tapLeafScript || [])
+-    .filter(tapLeaf => (0, psbtutils_1.pubkeyInScript)(pubkey, tapLeaf.script))
++    // .filter(tapLeaf => (0, psbtutils_1.pubkeyInScript)(pubkey, tapLeaf.script))
+     .map(tapLeaf => {
+       const hash = (0, bip341_1.tapleafHash)({
+         output: tapLeaf.script,

src/background/controller/wallet.ts

@@ -487,11 +487,20 @@ export class WalletController extends BaseController {
         const sighashTypes = input.sighashTypes?.map(Number);
         if (sighashTypes?.some(isNaN)) throw new Error('invalid sighash type in toSignInput');
 
+        let tapLeafHashToSign: Buffer | undefined;
+        if (input.tapLeafHashToSign) {
+          if (typeof input.tapLeafHashToSign === 'string') {
+            tapLeafHashToSign = Buffer.from(input.tapLeafHashToSign, 'hex');
+          } else {
+            tapLeafHashToSign = input.tapLeafHashToSign;
+          }
+        }
         return {
           index,
           publicKey: account.pubkey,
           sighashTypes,
-          disableTweakSigner: input.disableTweakSigner
+          disableTweakSigner: input.disableTweakSigner,
+          tapLeafHashToSign
         };
       });
     } else {

src/shared/types.ts

@@ -209,6 +209,7 @@ interface BaseUserToSignInput {
   index: number;
   sighashTypes: number[] | undefined;
   disableTweakSigner?: boolean;
+  tapLeafHashToSign?: string;
 }
 
 export interface AddressUserToSignInput extends BaseUserToSignInput {
@@ -230,6 +231,7 @@ export interface ToSignInput {
   index: number;
   publicKey: string;
   sighashTypes?: number[];
+  tapLeafHashToSign?: Buffer;
 }
 
 export type WalletKeyring = {