fix: OKX signature tweak signer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-staking",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "private": true,
   "scripts": {
     "dev": "next dev",

src/app/common/utils/psbt.ts

@@ -4,14 +4,35 @@ import { WalletProvider } from "@/utils/wallet/wallet_provider";
 
 const SIGN_PSBT_NOT_COMPATIBLE_WALLETS = ["OneKey"];
 
-export type SignPsbtTransaction = (psbtHex: string) => Promise<Transaction>;
+// wallets requiring to disable the tweakSigner option
+const SIGN_PSBT_DISABLE_TWEAK_SIGNER = ["OKX"];
+
+export type signPsbtMode = "staking" | "unbonding" | "withdrawal";
+
+export type SignPsbtTransaction = (
+  psbtHex: string,
+  signPsbtMode: signPsbtMode,
+) => Promise<Transaction>;
 
 // This method is created to accommodate backward compatibility with the
 // old implementation of signPsbt where the wallet.signPsbt method returns
 // the signed transaction in hex
 export const signPsbtTransaction = (wallet: WalletProvider) => {
-  return async (psbtHex: string) => {
-    const signedHex = await wallet.signPsbt(psbtHex);
+  return async (psbtHex: string, mode: signPsbtMode) => {
+    let shouldDisableTweakSigner = false;
+
+    if (
+      (mode === "unbonding" || mode === "withdrawal") &&
+      SIGN_PSBT_DISABLE_TWEAK_SIGNER.includes(
+        await wallet.getWalletProviderName(),
+      )
+    ) {
+      shouldDisableTweakSigner = true;
+    }
+
+    const signedHex = await wallet.signPsbt(psbtHex, {
+      disableTweakSigner: shouldDisableTweakSigner,
+    });
     const providerName = await wallet.getWalletProviderName();
     if (SIGN_PSBT_NOT_COMPATIBLE_WALLETS.includes(providerName)) {
       try {

src/utils/delegations/signStakingTx.ts

@@ -124,6 +124,7 @@ export const signStakingTx = async (
   try {
     stakingTx = await signPsbtTransaction(btcWallet)(
       unsignedStakingPsbt.toHex(),
+      "staking",
     );
   } catch (error: Error | any) {
     throw new Error(error?.message || "Staking transaction signing PSBT error");

src/utils/delegations/signUnbondingTx.ts

@@ -82,7 +82,7 @@ export const signUnbondingTx = async (
   // Sign the unbonding transaction
   let unbondingTx: Transaction;
   try {
-    unbondingTx = await signPsbtTx(unsignedUnbondingTx.toHex());
+    unbondingTx = await signPsbtTx(unsignedUnbondingTx.toHex(), "unbonding");
   } catch (error) {
     throw new Error("Failed to sign PSBT for the unbonding transaction");
   }

src/utils/delegations/signWithdrawalTx.ts

@@ -112,7 +112,7 @@ export const signWithdrawalTx = async (
   let withdrawalTx: Transaction;
   try {
     const { psbt } = withdrawPsbtTxResult;
-    withdrawalTx = await signPsbtTx(psbt.toHex());
+    withdrawalTx = await signPsbtTx(psbt.toHex(), "withdrawal");
   } catch (error) {
     throw new Error("Failed to sign PSBT for the withdrawal transaction");
   }

src/utils/wallet/providers/okx_wallet.ts

@@ -3,6 +3,7 @@ import {
   network,
   validateAddress,
 } from "@/config/network.config";
+import { isTaproot } from "@/utils/wallet";
 
 import {
   getAddressBalance,
@@ -15,6 +16,7 @@ import {
   Fees,
   InscriptionIdentifier,
   Network,
+  SignPsbtOptions,
   UTXO,
   WalletInfo,
   WalletProvider,
@@ -107,15 +109,37 @@ export class OKXWallet extends WalletProvider {
     return this.okxWalletInfo.publicKeyHex;
   };
 
-  signPsbt = async (psbtHex: string): Promise<string> => {
+  signPsbt = async (
+    psbtHex: string,
+    options?: SignPsbtOptions,
+  ): Promise<string> => {
     if (!this.okxWalletInfo) {
       throw new Error("OKX Wallet not connected");
     }
+
+    const shouldDisableTweakSigner = options?.disableTweakSigner || false;
+
     // Use signPsbt since it shows the fees
-    return await this.bitcoinNetworkProvider.signPsbt(psbtHex);
+    return await this.bitcoinNetworkProvider.signPsbt(
+      psbtHex,
+      // Required on 3.29.26 version
+      shouldDisableTweakSigner &&
+        isTaproot(this.okxWalletInfo.address) && {
+          toSignInputs: [
+            {
+              index: 0,
+              address: this.okxWalletInfo.address,
+              disableTweakSigner: true,
+            },
+          ],
+        },
+    );
   };
 
-  signPsbts = async (psbtsHexes: string[]): Promise<string[]> => {
+  signPsbts = async (
+    psbtsHexes: string[],
+    _options?: SignPsbtOptions,
+  ): Promise<string[]> => {
     if (!this.okxWalletInfo) {
       throw new Error("OKX Wallet not connected");
     }

src/utils/wallet/wallet_provider.ts

@@ -42,6 +42,10 @@ export type WalletInfo = {
   address: string;
 };
 
+export type SignPsbtOptions = {
+  disableTweakSigner?: boolean;
+};
+
 /**
  * Abstract class representing a wallet provider.
  * Provides methods for connecting to a wallet, retrieving wallet information, signing transactions, and more.
@@ -79,14 +83,20 @@ export abstract class WalletProvider {
    * @param psbtHex - The hex string of the unsigned PSBT to sign.
    * @returns A promise that resolves to the hex string of the signed PSBT.
    */
-  abstract signPsbt(psbtHex: string): Promise<string>;
+  abstract signPsbt(
+    psbtHex: string,
+    options?: SignPsbtOptions,
+  ): Promise<string>;
 
   /**
    * Signs multiple PSBTs in hex format.
    * @param psbtsHexes - The hex strings of the unsigned PSBTs to sign.
    * @returns A promise that resolves to an array of hex strings, each representing a signed PSBT.
    */
-  abstract signPsbts(psbtsHexes: string[]): Promise<string[]>;
+  abstract signPsbts(
+    psbtsHexes: string[],
+    options?: SignPsbtOptions,
+  ): Promise<string[]>;
 
   /**
    * Gets the network of the current account.