@ckb-ccc/xverse 1.0.31 → 1.0.33

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @ckb-ccc/xverse
 
+## 1.0.33
+### Patch Changes
+
+
+
+- [#346](https://github.com/ckb-devrel/ccc/pull/346) [`a803d5f`](https://github.com/ckb-devrel/ccc/commit/a803d5fba8d0e082c6aba14db156856025402e72) Thanks [@fghdotio](https://github.com/fghdotio)! - feat(core): add BTC PSBT signing support
+  
+  - Add `SignerBtc.signPsbt()`, `signAndBroadcastPsbt()`, and `broadcastPsbt()` for signing and broadcasting PSBTs
+  - Add `SignPsbtOptions` and `InputToSign` for configuring PSBT signing
+
+
+- [#379](https://github.com/ckb-devrel/ccc/pull/379) [`f01a05b`](https://github.com/ckb-devrel/ccc/commit/f01a05bab332d9f4e0cf7f84aecfd688f8e9f346) Thanks [@Hanssen0](https://github.com/Hanssen0)! - chore: bump pnpm to v11.8.0
+
+- Updated dependencies [[`1148a5c`](https://github.com/ckb-devrel/ccc/commit/1148a5c403cde985fb4ba713ccfa0c163d287174), [`bf0f8d8`](https://github.com/ckb-devrel/ccc/commit/bf0f8d8ca011e627821445a10bc38519510e5b9d), [`a803d5f`](https://github.com/ckb-devrel/ccc/commit/a803d5fba8d0e082c6aba14db156856025402e72), [`bf0f8d8`](https://github.com/ckb-devrel/ccc/commit/bf0f8d8ca011e627821445a10bc38519510e5b9d), [`6727ffe`](https://github.com/ckb-devrel/ccc/commit/6727ffe05f60e6bfb2060a565c19acb0fd0f375e), [`f01a05b`](https://github.com/ckb-devrel/ccc/commit/f01a05bab332d9f4e0cf7f84aecfd688f8e9f346), [`a526890`](https://github.com/ckb-devrel/ccc/commit/a5268909ea9d61c4e2f5187a43e2318327b27cae), [`4bb3d9d`](https://github.com/ckb-devrel/ccc/commit/4bb3d9d2ef36b3ee8820036625abd9befb1980c4), [`9f7ecb6`](https://github.com/ckb-devrel/ccc/commit/9f7ecb6ab8db9c6866dad029f2888e1e5cfcbe7d)]:
+  - @ckb-ccc/core@1.13.0
+
+## 1.0.32
+### Patch Changes
+
+- Updated dependencies [[`a96dec6`](https://github.com/ckb-devrel/ccc/commit/a96dec6d0517113391b0edc510f1af821a45d5a8)]:
+  - @ckb-ccc/core@1.12.5
+
 ## 1.0.31
 ### Patch Changes
 

package/dist/signer.d.ts

@@ -43,5 +43,39 @@ export declare class Signer extends ccc.SignerBtc {
      * @returns A promise that resolves to the signed message.
      */
     signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
+    /**
+     * Build default inputsToSign for all unsigned inputs
+     */
+    private buildDefaultinputsToSign;
+    private prepareSignPsbtParams;
+    /**
+     * Signs a PSBT using Xverse wallet.
+     *
+     * @param psbtHex - The hex string of PSBT to sign.
+     * @param options - Options for signing the PSBT
+     * @returns A promise that resolves to the signed PSBT as a Hex string
+     *
+     * @remarks
+     * Xverse accepts:
+     * - psbt: A string representing the PSBT to sign, encoded in base64
+     * - signInputs: A Record<string, number[]> where:
+     *   - keys are the addresses to use for signing
+     *   - values are the indexes of the inputs to sign with each address
+     *
+     * Xverse returns:
+     * - psbt: The base64 encoded signed PSBT
+     *
+     * @see https://docs.xverse.app/sats-connect/bitcoin-methods/signpsbt
+     */
+    signPsbt(psbtHex: ccc.HexLike, options?: ccc.SignPsbtOptionsLike): Promise<ccc.Hex>;
+    /**
+     * Broadcasts a PSBT to the Bitcoin network.
+     *
+     * @remarks
+     * Xverse does not support broadcasting a signed PSBT directly.
+     * It only supports "Sign and Broadcast" as a single atomic operation via `signAndBroadcastPsbt`.
+     */
+    broadcastPsbt(_psbtHex: ccc.HexLike, _options?: ccc.SignPsbtOptionsLike): Promise<ccc.Hex>;
+    signAndBroadcastPsbt(psbtHex: ccc.HexLike, options?: ccc.SignPsbtOptionsLike): Promise<ccc.Hex>;
 }
 //# sourceMappingURL=signer.d.ts.map

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EACL,OAAO,EAEP,WAAW,EAQZ,MAAM,qBAAqB,CAAC;AAuB7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,QAAQ,EAAE,WAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,YAAY,CAA2C;IAE/D;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,WAAW,EACpB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKG,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBvC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAc5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAcvE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EACL,OAAO,EAEP,WAAW,EAQZ,MAAM,qBAAqB,CAAC;AAuB7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,QAAQ,EAAE,WAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,YAAY,CAA2C;IAE/D;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,WAAW,EACpB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKG,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBvC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAc5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAetE;;OAEG;IACH,OAAO,CAAC,wBAAwB;YAmClB,qBAAqB;IAoCnC;;;;;;;;;;;;;;;;;;OAkBG;IACG,QAAQ,CACZ,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,OAAO,CAAC,EAAE,GAAG,CAAC,mBAAmB,GAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAmBnB;;;;;;OAMG;IACG,aAAa,CACjB,QAAQ,EAAE,GAAG,CAAC,OAAO,EACrB,QAAQ,CAAC,EAAE,GAAG,CAAC,mBAAmB,GACjC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAMb,oBAAoB,CACxB,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,OAAO,CAAC,EAAE,GAAG,CAAC,mBAAmB,GAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAqBpB"}

package/dist/signer.js

@@ -1,4 +1,5 @@
 import { ccc } from "@ckb-ccc/core";
+import { Psbt } from "bitcoinjs-lib";
 import * as v from "valibot";
 import { AddressPurpose, MessageSigningProtocols, RpcErrorCode, rpcErrorResponseMessageSchema, rpcSuccessResponseMessageSchema, } from "./advancedBarrel.js";
 async function checkResponse(response) {
@@ -122,4 +123,103 @@ export class Signer extends ccc.SignerBtc {
             protocol: MessageSigningProtocols.ECDSA,
         }))).signature;
     }
+    /**
+     * Build default inputsToSign for all unsigned inputs
+     */
+    buildDefaultinputsToSign(psbtHex, address) {
+        const inputsToSign = [];
+        try {
+            // Collect all unsigned inputs
+            const psbt = Psbt.fromHex(psbtHex.slice(2));
+            psbt.data.inputs.forEach((input, index) => {
+                const isSigned = input.finalScriptSig ||
+                    input.finalScriptWitness ||
+                    input.tapKeySig ||
+                    (input.partialSig && input.partialSig.length > 0) ||
+                    (input.tapScriptSig && input.tapScriptSig.length > 0);
+                if (!isSigned) {
+                    inputsToSign.push({ index, address });
+                }
+            });
+            // If no unsigned inputs found, the PSBT is already fully signed
+            // Let the wallet handle this case (likely a no-op or error)
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to parse PSBT hex. Please provide inputsToSign explicitly in options. Original error: ${errorMessage}`);
+        }
+        return inputsToSign;
+    }
+    async prepareSignPsbtParams(psbtHex, options) {
+        let inputsToSign = options?.inputsToSign;
+        if (!inputsToSign || !inputsToSign.length) {
+            const address = await this.getBtcAccount();
+            inputsToSign = this.buildDefaultinputsToSign(psbtHex, address);
+        }
+        const psbtBase64 = ccc.bytesTo(psbtHex, "base64");
+        const signInputs = inputsToSign.reduce((acc, input) => {
+            if (!input.address) {
+                throw new Error("Xverse only supports signing with address. Please provide 'address' in inputsToSign.");
+            }
+            if (acc[input.address]) {
+                acc[input.address].push(input.index);
+            }
+            else {
+                acc[input.address] = [input.index];
+            }
+            return acc;
+        }, {});
+        return { psbtBase64, signInputs };
+    }
+    /**
+     * Signs a PSBT using Xverse wallet.
+     *
+     * @param psbtHex - The hex string of PSBT to sign.
+     * @param options - Options for signing the PSBT
+     * @returns A promise that resolves to the signed PSBT as a Hex string
+     *
+     * @remarks
+     * Xverse accepts:
+     * - psbt: A string representing the PSBT to sign, encoded in base64
+     * - signInputs: A Record<string, number[]> where:
+     *   - keys are the addresses to use for signing
+     *   - values are the indexes of the inputs to sign with each address
+     *
+     * Xverse returns:
+     * - psbt: The base64 encoded signed PSBT
+     *
+     * @see https://docs.xverse.app/sats-connect/bitcoin-methods/signpsbt
+     */
+    async signPsbt(psbtHex, options) {
+        const { psbtBase64, signInputs } = await this.prepareSignPsbtParams(ccc.hexFrom(psbtHex), options);
+        const signedPsbtBase64 = (await checkResponse(this.provider.request("signPsbt", {
+            psbt: psbtBase64,
+            signInputs,
+            broadcast: false,
+        }))).psbt;
+        return ccc.hexFrom(ccc.bytesFrom(signedPsbtBase64, "base64"));
+    }
+    /**
+     * Broadcasts a PSBT to the Bitcoin network.
+     *
+     * @remarks
+     * Xverse does not support broadcasting a signed PSBT directly.
+     * It only supports "Sign and Broadcast" as a single atomic operation via `signAndBroadcastPsbt`.
+     */
+    async broadcastPsbt(_psbtHex, _options) {
+        throw new Error("Xverse does not support broadcasting signed PSBTs directly. Use signAndBroadcastPsbt instead.");
+    }
+    async signAndBroadcastPsbt(psbtHex, options) {
+        // ccc.hexFrom adds 0x prefix, but BTC expects non-0x
+        const { psbtBase64, signInputs } = await this.prepareSignPsbtParams(ccc.hexFrom(psbtHex), options);
+        const result = await checkResponse(this.provider.request("signPsbt", {
+            psbt: psbtBase64,
+            signInputs,
+            broadcast: true,
+        }));
+        if (!result.txid) {
+            throw new Error("Failed to broadcast PSBT");
+        }
+        return ccc.hexFrom(result.txid);
+    }
 }

package/dist.commonjs/signer.d.ts

@@ -43,5 +43,39 @@ export declare class Signer extends ccc.SignerBtc {
      * @returns A promise that resolves to the signed message.
      */
     signMessageRaw(message: string | ccc.BytesLike): Promise<string>;
+    /**
+     * Build default inputsToSign for all unsigned inputs
+     */
+    private buildDefaultinputsToSign;
+    private prepareSignPsbtParams;
+    /**
+     * Signs a PSBT using Xverse wallet.
+     *
+     * @param psbtHex - The hex string of PSBT to sign.
+     * @param options - Options for signing the PSBT
+     * @returns A promise that resolves to the signed PSBT as a Hex string
+     *
+     * @remarks
+     * Xverse accepts:
+     * - psbt: A string representing the PSBT to sign, encoded in base64
+     * - signInputs: A Record<string, number[]> where:
+     *   - keys are the addresses to use for signing
+     *   - values are the indexes of the inputs to sign with each address
+     *
+     * Xverse returns:
+     * - psbt: The base64 encoded signed PSBT
+     *
+     * @see https://docs.xverse.app/sats-connect/bitcoin-methods/signpsbt
+     */
+    signPsbt(psbtHex: ccc.HexLike, options?: ccc.SignPsbtOptionsLike): Promise<ccc.Hex>;
+    /**
+     * Broadcasts a PSBT to the Bitcoin network.
+     *
+     * @remarks
+     * Xverse does not support broadcasting a signed PSBT directly.
+     * It only supports "Sign and Broadcast" as a single atomic operation via `signAndBroadcastPsbt`.
+     */
+    broadcastPsbt(_psbtHex: ccc.HexLike, _options?: ccc.SignPsbtOptionsLike): Promise<ccc.Hex>;
+    signAndBroadcastPsbt(psbtHex: ccc.HexLike, options?: ccc.SignPsbtOptionsLike): Promise<ccc.Hex>;
 }
 //# sourceMappingURL=signer.d.ts.map

package/dist.commonjs/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAEpC,OAAO,EACL,OAAO,EAEP,WAAW,EAQZ,MAAM,qBAAqB,CAAC;AAuB7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,QAAQ,EAAE,WAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,YAAY,CAA2C;IAE/D;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,WAAW,EACpB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKG,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBvC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAc5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;CAcvE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGpC,OAAO,EACL,OAAO,EAEP,WAAW,EAQZ,MAAM,qBAAqB,CAAC;AAuB7B;;;GAGG;AACH,qBAAa,MAAO,SAAQ,GAAG,CAAC,SAAS;aAUrB,QAAQ,EAAE,WAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,iBAAiB;IAVpC,OAAO,CAAC,YAAY,CAA2C;IAE/D;;;;OAIG;gBAED,MAAM,EAAE,GAAG,CAAC,MAAM,EACF,QAAQ,EAAE,WAAW,EACpB,iBAAiB,GAAE,GAAG,CAAC,iBAAiB,EAWxD;IAKG,aAAa,IAAI,OAAO,CAAC,OAAO,CAAC;IAwBvC;;;OAGG;IACG,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC;IAItC;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAIzC;;;OAGG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAIjC,UAAU,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAc5C;;;OAGG;IACG,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IASrC;;;;OAIG;IACG,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;IAetE;;OAEG;IACH,OAAO,CAAC,wBAAwB;YAmClB,qBAAqB;IAoCnC;;;;;;;;;;;;;;;;;;OAkBG;IACG,QAAQ,CACZ,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,OAAO,CAAC,EAAE,GAAG,CAAC,mBAAmB,GAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAmBnB;;;;;;OAMG;IACG,aAAa,CACjB,QAAQ,EAAE,GAAG,CAAC,OAAO,EACrB,QAAQ,CAAC,EAAE,GAAG,CAAC,mBAAmB,GACjC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;IAMb,oBAAoB,CACxB,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,OAAO,CAAC,EAAE,GAAG,CAAC,mBAAmB,GAChC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;CAqBpB"}

package/dist.commonjs/signer.js

@@ -35,6 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Signer = void 0;
 const core_1 = require("@ckb-ccc/core");
+const bitcoinjs_lib_1 = require("bitcoinjs-lib");
 const v = __importStar(require("valibot"));
 const advancedBarrel_js_1 = require("./advancedBarrel.js");
 async function checkResponse(response) {
@@ -158,5 +159,104 @@ class Signer extends core_1.ccc.SignerBtc {
             protocol: advancedBarrel_js_1.MessageSigningProtocols.ECDSA,
         }))).signature;
     }
+    /**
+     * Build default inputsToSign for all unsigned inputs
+     */
+    buildDefaultinputsToSign(psbtHex, address) {
+        const inputsToSign = [];
+        try {
+            // Collect all unsigned inputs
+            const psbt = bitcoinjs_lib_1.Psbt.fromHex(psbtHex.slice(2));
+            psbt.data.inputs.forEach((input, index) => {
+                const isSigned = input.finalScriptSig ||
+                    input.finalScriptWitness ||
+                    input.tapKeySig ||
+                    (input.partialSig && input.partialSig.length > 0) ||
+                    (input.tapScriptSig && input.tapScriptSig.length > 0);
+                if (!isSigned) {
+                    inputsToSign.push({ index, address });
+                }
+            });
+            // If no unsigned inputs found, the PSBT is already fully signed
+            // Let the wallet handle this case (likely a no-op or error)
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`Failed to parse PSBT hex. Please provide inputsToSign explicitly in options. Original error: ${errorMessage}`);
+        }
+        return inputsToSign;
+    }
+    async prepareSignPsbtParams(psbtHex, options) {
+        let inputsToSign = options?.inputsToSign;
+        if (!inputsToSign || !inputsToSign.length) {
+            const address = await this.getBtcAccount();
+            inputsToSign = this.buildDefaultinputsToSign(psbtHex, address);
+        }
+        const psbtBase64 = core_1.ccc.bytesTo(psbtHex, "base64");
+        const signInputs = inputsToSign.reduce((acc, input) => {
+            if (!input.address) {
+                throw new Error("Xverse only supports signing with address. Please provide 'address' in inputsToSign.");
+            }
+            if (acc[input.address]) {
+                acc[input.address].push(input.index);
+            }
+            else {
+                acc[input.address] = [input.index];
+            }
+            return acc;
+        }, {});
+        return { psbtBase64, signInputs };
+    }
+    /**
+     * Signs a PSBT using Xverse wallet.
+     *
+     * @param psbtHex - The hex string of PSBT to sign.
+     * @param options - Options for signing the PSBT
+     * @returns A promise that resolves to the signed PSBT as a Hex string
+     *
+     * @remarks
+     * Xverse accepts:
+     * - psbt: A string representing the PSBT to sign, encoded in base64
+     * - signInputs: A Record<string, number[]> where:
+     *   - keys are the addresses to use for signing
+     *   - values are the indexes of the inputs to sign with each address
+     *
+     * Xverse returns:
+     * - psbt: The base64 encoded signed PSBT
+     *
+     * @see https://docs.xverse.app/sats-connect/bitcoin-methods/signpsbt
+     */
+    async signPsbt(psbtHex, options) {
+        const { psbtBase64, signInputs } = await this.prepareSignPsbtParams(core_1.ccc.hexFrom(psbtHex), options);
+        const signedPsbtBase64 = (await checkResponse(this.provider.request("signPsbt", {
+            psbt: psbtBase64,
+            signInputs,
+            broadcast: false,
+        }))).psbt;
+        return core_1.ccc.hexFrom(core_1.ccc.bytesFrom(signedPsbtBase64, "base64"));
+    }
+    /**
+     * Broadcasts a PSBT to the Bitcoin network.
+     *
+     * @remarks
+     * Xverse does not support broadcasting a signed PSBT directly.
+     * It only supports "Sign and Broadcast" as a single atomic operation via `signAndBroadcastPsbt`.
+     */
+    async broadcastPsbt(_psbtHex, _options) {
+        throw new Error("Xverse does not support broadcasting signed PSBTs directly. Use signAndBroadcastPsbt instead.");
+    }
+    async signAndBroadcastPsbt(psbtHex, options) {
+        // ccc.hexFrom adds 0x prefix, but BTC expects non-0x
+        const { psbtBase64, signInputs } = await this.prepareSignPsbtParams(core_1.ccc.hexFrom(psbtHex), options);
+        const result = await checkResponse(this.provider.request("signPsbt", {
+            psbt: psbtBase64,
+            signInputs,
+            broadcast: true,
+        }));
+        if (!result.txid) {
+            throw new Error("Failed to broadcast PSBT");
+        }
+        return core_1.ccc.hexFrom(result.txid);
+    }
 }
 exports.Signer = Signer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckb-ccc/xverse",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "CCC - CKBer's Codebase. Common Chains Connector's support for Xverse",
   "author": "Hanssen0 <hanssen0@hanssen0.com>",
   "license": "MIT",
@@ -51,8 +51,9 @@
     "access": "public"
   },
   "dependencies": {
+    "bitcoinjs-lib": "^7.0.0",
     "valibot": "^1.1.0",
-    "@ckb-ccc/core": "1.12.4"
+    "@ckb-ccc/core": "1.13.0"
   },
   "scripts": {
     "build": "rimraf ./dist && rimraf ./dist.commonjs && tsc && tsc --project tsconfig.commonjs.json && copyfiles -u 2 misc/basedirs/**/* .",

package/src/signer.ts

@@ -1,4 +1,5 @@
 import { ccc } from "@ckb-ccc/core";
+import { Psbt } from "bitcoinjs-lib";
 import * as v from "valibot";
 import {
   Address,
@@ -169,4 +170,160 @@ export class Signer extends ccc.SignerBtc {
       )
     ).signature;
   }
+
+  /**
+   * Build default inputsToSign for all unsigned inputs
+   */
+  private buildDefaultinputsToSign(
+    psbtHex: ccc.Hex,
+    address: string,
+  ): ccc.InputToSignLike[] {
+    const inputsToSign: ccc.InputToSignLike[] = [];
+
+    try {
+      // Collect all unsigned inputs
+      const psbt = Psbt.fromHex(psbtHex.slice(2));
+      psbt.data.inputs.forEach((input, index) => {
+        const isSigned =
+          input.finalScriptSig ||
+          input.finalScriptWitness ||
+          input.tapKeySig ||
+          (input.partialSig && input.partialSig.length > 0) ||
+          (input.tapScriptSig && input.tapScriptSig.length > 0);
+
+        if (!isSigned) {
+          inputsToSign.push({ index, address });
+        }
+      });
+
+      // If no unsigned inputs found, the PSBT is already fully signed
+      // Let the wallet handle this case (likely a no-op or error)
+    } catch (error) {
+      const errorMessage =
+        error instanceof Error ? error.message : String(error);
+      throw new Error(
+        `Failed to parse PSBT hex. Please provide inputsToSign explicitly in options. Original error: ${errorMessage}`,
+      );
+    }
+
+    return inputsToSign;
+  }
+
+  private async prepareSignPsbtParams(
+    psbtHex: ccc.Hex,
+    options?: ccc.SignPsbtOptionsLike,
+  ): Promise<{
+    psbtBase64: string;
+    signInputs: Record<string, number[]>;
+  }> {
+    let inputsToSign = options?.inputsToSign;
+
+    if (!inputsToSign || !inputsToSign.length) {
+      const address = await this.getBtcAccount();
+      inputsToSign = this.buildDefaultinputsToSign(psbtHex, address);
+    }
+
+    const psbtBase64 = ccc.bytesTo(psbtHex, "base64");
+
+    const signInputs = inputsToSign.reduce(
+      (acc, input) => {
+        if (!input.address) {
+          throw new Error(
+            "Xverse only supports signing with address. Please provide 'address' in inputsToSign.",
+          );
+        }
+        if (acc[input.address]) {
+          acc[input.address].push(input.index);
+        } else {
+          acc[input.address] = [input.index];
+        }
+        return acc;
+      },
+      {} as Record<string, number[]>,
+    );
+
+    return { psbtBase64, signInputs };
+  }
+
+  /**
+   * Signs a PSBT using Xverse wallet.
+   *
+   * @param psbtHex - The hex string of PSBT to sign.
+   * @param options - Options for signing the PSBT
+   * @returns A promise that resolves to the signed PSBT as a Hex string
+   *
+   * @remarks
+   * Xverse accepts:
+   * - psbt: A string representing the PSBT to sign, encoded in base64
+   * - signInputs: A Record<string, number[]> where:
+   *   - keys are the addresses to use for signing
+   *   - values are the indexes of the inputs to sign with each address
+   *
+   * Xverse returns:
+   * - psbt: The base64 encoded signed PSBT
+   *
+   * @see https://docs.xverse.app/sats-connect/bitcoin-methods/signpsbt
+   */
+  async signPsbt(
+    psbtHex: ccc.HexLike,
+    options?: ccc.SignPsbtOptionsLike,
+  ): Promise<ccc.Hex> {
+    const { psbtBase64, signInputs } = await this.prepareSignPsbtParams(
+      ccc.hexFrom(psbtHex),
+      options,
+    );
+
+    const signedPsbtBase64 = (
+      await checkResponse(
+        this.provider.request("signPsbt", {
+          psbt: psbtBase64,
+          signInputs,
+          broadcast: false,
+        }),
+      )
+    ).psbt;
+
+    return ccc.hexFrom(ccc.bytesFrom(signedPsbtBase64, "base64"));
+  }
+
+  /**
+   * Broadcasts a PSBT to the Bitcoin network.
+   *
+   * @remarks
+   * Xverse does not support broadcasting a signed PSBT directly.
+   * It only supports "Sign and Broadcast" as a single atomic operation via `signAndBroadcastPsbt`.
+   */
+  async broadcastPsbt(
+    _psbtHex: ccc.HexLike,
+    _options?: ccc.SignPsbtOptionsLike,
+  ): Promise<ccc.Hex> {
+    throw new Error(
+      "Xverse does not support broadcasting signed PSBTs directly. Use signAndBroadcastPsbt instead.",
+    );
+  }
+
+  async signAndBroadcastPsbt(
+    psbtHex: ccc.HexLike,
+    options?: ccc.SignPsbtOptionsLike,
+  ): Promise<ccc.Hex> {
+    // ccc.hexFrom adds 0x prefix, but BTC expects non-0x
+    const { psbtBase64, signInputs } = await this.prepareSignPsbtParams(
+      ccc.hexFrom(psbtHex),
+      options,
+    );
+
+    const result = await checkResponse(
+      this.provider.request("signPsbt", {
+        psbt: psbtBase64,
+        signInputs,
+        broadcast: true,
+      }),
+    );
+
+    if (!result.txid) {
+      throw new Error("Failed to broadcast PSBT");
+    }
+
+    return ccc.hexFrom(result.txid);
+  }
 }