Merge branch 'main' into to-psbtv0

caravan-bitcoin · Nov 24, 2024 · 86a322e · 86a322e
2 parents 9852804 + 48da7df
commit 86a322e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/caravan-wallets/CHANGELOG.md b/packages/caravan-wallets/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.4.4
+
+### Patch Changes
+
+- [#156](https://github.com/caravan-bitcoin/caravan/pull/156) [`a35893d`](https://github.com/caravan-bitcoin/caravan/commit/a35893d3f2733b8ba6661bc955713813daa3a75d) Thanks [@chadchapnick](https://github.com/chadchapnick)! - support regtest network in coldcard and custom interactions
+
 ## 0.4.3
 
 ### Patch Changes

diff --git a/packages/caravan-wallets/package.json b/packages/caravan-wallets/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@caravan/wallets",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "Unchained Capital's HWI Library",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

diff --git a/packages/caravan-wallets/src/coldcard.ts b/packages/caravan-wallets/src/coldcard.ts
@@ -75,7 +75,11 @@ class ColdcardMultisigSettingsFileParser extends ColdcardInteraction {
     bip32Path: string;
   }) {
     super();
-    if ([Network.MAINNET, Network.TESTNET].find((net) => net === network)) {
+    if (
+      [Network.MAINNET, Network.TESTNET, Network.REGTEST].find(
+        (net) => net === network
+      )
+    ) {
       this.network = network;
     } else {
       throw new Error("Unknown network.");

diff --git a/packages/caravan-wallets/src/custom.ts b/packages/caravan-wallets/src/custom.ts
@@ -68,7 +68,11 @@ export class CustomExportExtendedPublicKey extends CustomInteraction {
 
   constructor({ network, bip32Path }) {
     super();
-    if ([Network.MAINNET, Network.TESTNET].find((net) => net === network)) {
+    if (
+      [Network.MAINNET, Network.TESTNET, Network.REGTEST].find(
+        (net) => net === network
+      )
+    ) {
       this.network = network;
     } else {
       throw new Error("Unknown network.");