consolidate PSBT exports to @caravan/psbt by kunal-595 · Pull Request #466 · caravan-bitcoin/caravan

kunal-595 · 2026-02-03T23:21:09Z

Hi,@bucko13

What kind of change does this PR introduce?
Refactoring / internal maintenance

Issue Number:
Fixes #461

Snapshots/Videos:
N/A – internal refactoring, no UI changes

If relevant, did you update the documentation?
N/A – internal refactoring only

Summary

This PR implements Step 1 of #461 by consolidating PSBT ownership on @caravan/psbt.

Specifically, it:

Moves PSBT signature related helpers into @caravan/psbt
Deprecates and removes internal PSBT exports from @caravan/bitcoin
Updates the coordinator to consume PSBT functionlity exclusively from @caravan/psbt

The change is intentionally scoped to avoid any modifications to cryptographic behavior, ECC initialization, or wallet signing logic. Existing PSBT construction and signing behavior is preserved, with regresion coverage added to ensure parity.

Does this PR introduce a breaking change?
No. This is an internal refactor with no user-visible or behavioral changes.

Checklist

I have tested my changes thoroughly.
I have added or updated tests to cover my changes (if applicable).
I have verified that test coverage meets or exceeds 95% (if applicable).
I have run the test suite locally, and all tests pass.
I have written tests for all new changes/features.
I have followed the project's coding style and conventions.
I have created a changeset to document my changes (npm run changeset).

Other information

All tests pass locally (322 tests).
New test coverage added for:

addSignaturesToPSBT
parseSignaturesFromPSBT
parseSignatureArrayFromPSBT

Follow-up work (ECC abstraction, bitcoinjs lib v6 migration, wallet updates) is intentionally deferred to separate PRs after this change lands.

Have you read the contributing guide?
Yes

vercel · 2026-02-03T23:21:14Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
caravan-coordinator	Ready	Preview, Comment	Feb 3, 2026 11:23pm

changeset-bot · 2026-02-03T23:21:14Z

🦋 Changeset detected

Latest commit: 3fbc890

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 2 packages

Name	Type
@caravan/psbt	Minor
@caravan/bitcoin	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copilot

Pull request overview

This PR implements the first step of consolidating PSBT functionality by moving signature-related helpers from @caravan/bitcoin to @caravan/psbt. The refactoring is part of a larger effort to standardize on bitcoinjs-lib v6 and eliminate duplicate PSBT implementations.

Changes:

Adds addSignaturesToPSBT, parseSignaturesFromPSBT, and parseSignatureArrayFromPSBT functions to @caravan/psbt with bitcoinjs-lib v6 support
Deprecates corresponding functions and constants in @caravan/bitcoin without removing them
Updates the coordinator application to import PSBT signature functions from @caravan/psbt instead of @caravan/bitcoin

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
packages/caravan-psbt/src/psbtv0/psbt.ts	Adds three PSBT signature helper functions and two private helper functions with v6 API compatibility
packages/caravan-psbt/src/psbtv0/psbt.test.ts	Adds minimal test coverage for the new functions (error cases only)
packages/caravan-bitcoin/src/psbt.ts	Adds @deprecated JSDoc tags to functions and constants being migrated
apps/coordinator/src/components/Wallet/WalletSign.jsx	Updates import to use @caravan/psbt
apps/coordinator/src/components/ScriptExplorer/Transaction.jsx	Updates import to use @caravan/psbt
apps/coordinator/src/components/ScriptExplorer/SignatureImporter.jsx	Updates import to use @caravan/psbt
apps/coordinator/src/components/Hermit/HermitSignatureImporterPsbt.jsx	Updates import to use @caravan/psbt
apps/coordinator/src/components/Hermit/HermitSignatureImporter.tsx	Updates import to use @caravan/psbt
.changeset/good-moons-cheat.md	Documents the changes with appropriate semver bumps (minor for psbt, patch for bitcoin)

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-03T23:25:54Z

packages/caravan-psbt/src/psbtv0/psbt.test.ts

+describe("parseSignaturesFromPSBT", () => {
+  it("should return null for invalid PSBT", () => {
+    expect(parseSignaturesFromPSBT("invalid")).toBeNull();
+  });
+
+  it("should return null for PSBT with no signatures", () => {
+    // Unsigned PSBT from test fixtures
+    const unsignedPsbt = TEST_FIXTURES.transactions[0].psbt;
+    if (unsignedPsbt) {
+      expect(parseSignaturesFromPSBT(unsignedPsbt)).toBeNull();
+    }
+  });
+});
+
+describe("parseSignatureArrayFromPSBT", () => {
+  it("should return null for invalid PSBT", () => {
+    expect(parseSignatureArrayFromPSBT("invalid")).toBeNull();
+  });
+
+  it("should return null for PSBT with no signatures", () => {
+    const unsignedPsbt = TEST_FIXTURES.transactions[0].psbt;
+    if (unsignedPsbt) {
+      expect(parseSignatureArrayFromPSBT(unsignedPsbt)).toBeNull();
+    }
+  });
+});
+
+describe("addSignaturesToPSBT", () => {
+  it("should return null for invalid PSBT", () => {
+    expect(addSignaturesToPSBT("testnet", "invalid", [], [])).toBeNull();
+  });
+});


The test coverage for the newly added functions is insufficient. While the existing tests in @caravan/bitcoin (packages/caravan-bitcoin/src/psbt.test.ts) include comprehensive tests for partially signed PSBTs, fully signed PSBTs with single and multiple inputs, the tests here only cover error cases (invalid PSBTs and PSBTs with no signatures). Consider adding tests that verify the happy path scenarios, such as:

Successfully adding signatures to an unsigned PSBT

Parsing signatures from partially signed PSBTs

Parsing signatures from fully signed PSBTs with single and multiple inputs

Verifying signature validation works correctly

These tests would ensure functional parity with the original implementation and provide confidence in the migration.

@kunal-595 did you copy all the tests from packages/caravan-bitcoin/src/psbt.test.ts to packages/caravan-psbt/src/psbtv0/psbt.test.ts ?

Not yet , i have only added error case coverage (invalid PSBTs, no signatures) .

the happy path tests from packages/caravan-bitcoin/src/psbt.test.ts including unsigned, partially signed, and fully signed PSBT fixtures (single and multi-input), along with signature parsing and addition have not been ported yet
i will move those next to reach parity with the original implemntation

Legend101Zz

Looks really good overall thanks for taking this up with, I think the approach you took would also not cause any breaks and maybe the comment I had earlier on the issue would have been wrong , I'll test it out once to also confirm eveyrthing works nicely :)

Legend101Zz · 2026-02-10T02:56:04Z

packages/caravan-psbt/src/psbtv0/psbt.ts

+    },
+  ];
+  psbt.data.updateInput(inputIndex, { partialSig });
+  const validator = (pk: any, msghash: any, sig: any): boolean =>


maybe as we are moving things from @caravan/bitcoin to @caravan/psbt we can take this chance to also add some type defs if possible

Great idea , i will add explicit types while migrating this code.
That includes removing any from the validator and defining clear parameter and return types for the signature helpers, i will include this in the same PR.

Legend101Zz · 2026-02-10T02:58:50Z

packages/caravan-psbt/src/psbtv0/psbt.ts

+ * adds partial signature object(s) to each input and returns the PSBT with
+ * partial signature(s) included.
+ */
+export function addSignaturesToPSBT(network, psbt, pubkeys, signatures) {


same maybe some type defs

Legend101Zz · 2026-02-10T03:01:21Z

packages/caravan-psbt/src/psbtv0/psbt.test.ts

+describe("parseSignaturesFromPSBT", () => {
+  it("should return null for invalid PSBT", () => {
+    expect(parseSignaturesFromPSBT("invalid")).toBeNull();
+  });
+
+  it("should return null for PSBT with no signatures", () => {
+    // Unsigned PSBT from test fixtures
+    const unsignedPsbt = TEST_FIXTURES.transactions[0].psbt;
+    if (unsignedPsbt) {
+      expect(parseSignaturesFromPSBT(unsignedPsbt)).toBeNull();
+    }
+  });
+});
+
+describe("parseSignatureArrayFromPSBT", () => {
+  it("should return null for invalid PSBT", () => {
+    expect(parseSignatureArrayFromPSBT("invalid")).toBeNull();
+  });
+
+  it("should return null for PSBT with no signatures", () => {
+    const unsignedPsbt = TEST_FIXTURES.transactions[0].psbt;
+    if (unsignedPsbt) {
+      expect(parseSignatureArrayFromPSBT(unsignedPsbt)).toBeNull();
+    }
+  });
+});
+
+describe("addSignaturesToPSBT", () => {
+  it("should return null for invalid PSBT", () => {
+    expect(addSignaturesToPSBT("testnet", "invalid", [], [])).toBeNull();
+  });
+});


@kunal-595 did you copy all the tests from packages/caravan-bitcoin/src/psbt.test.ts to packages/caravan-psbt/src/psbtv0/psbt.test.ts ?

Legend101Zz · 2026-02-10T03:05:21Z

@bucko13 can you please approve the workflow , so we can test if this did not break any functionality ?

consolidate PSBT exports to @caravan/psbt

3fbc890

Copilot AI review requested due to automatic review settings February 3, 2026 23:21

Copilot started reviewing on behalf of kunal-595 February 3, 2026 23:21 View session

vercel bot deployed to Preview February 3, 2026 23:23 View deployment

Copilot AI reviewed Feb 3, 2026

View reviewed changes

Legend101Zz suggested changes Feb 10, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

consolidate PSBT exports to @caravan/psbt#466

consolidate PSBT exports to @caravan/psbt#466
kunal-595 wants to merge 1 commit intocaravan-bitcoin:mainfrom
kunal-595:refactor/psbt-ownership

kunal-595 commented Feb 3, 2026

Uh oh!

vercel bot commented Feb 3, 2026 •

edited

Loading

Uh oh!

changeset-bot bot commented Feb 3, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Feb 3, 2026

Uh oh!

Legend101Zz Feb 10, 2026

Uh oh!

kunal-595 Feb 10, 2026

Uh oh!

Legend101Zz left a comment

Uh oh!

Legend101Zz Feb 10, 2026

Uh oh!

kunal-595 Feb 10, 2026

Uh oh!

Legend101Zz Feb 10, 2026

Uh oh!

Legend101Zz Feb 10, 2026

Uh oh!

Legend101Zz commented Feb 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

kunal-595 commented Feb 3, 2026

Summary

Checklist

Uh oh!

vercel bot commented Feb 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

changeset-bot bot commented Feb 3, 2026

🦋 Changeset detected

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 3, 2026

Choose a reason for hiding this comment

Uh oh!

Legend101Zz Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

kunal-595 Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Legend101Zz left a comment

Choose a reason for hiding this comment

Uh oh!

Legend101Zz Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

kunal-595 Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Legend101Zz Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Legend101Zz Feb 10, 2026

Choose a reason for hiding this comment

Uh oh!

Legend101Zz commented Feb 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

vercel bot commented Feb 3, 2026 •

edited

Loading