Merge branch 'main' into dependabot/npm_and_yarn/packages/caravan-wal…

…lets/axios-1.7.4
caravan-bitcoin · Nov 26, 2024 · 1e2d7f4 · 1e2d7f4
2 parents 91d6f43 + 48da7df
commit 1e2d7f4
Show file tree

Hide file tree

Showing 64 changed files with 7,360 additions and 314 deletions.
diff --git a/apps/coordinator/CHANGELOG.md b/apps/coordinator/CHANGELOG.md
@@ -1,5 +1,32 @@
 # Changelog
 
+## 1.4.1
+
+### Patch Changes
+
+- [#147](https://github.com/caravan-bitcoin/caravan/pull/147) [`0a73b09`](https://github.com/caravan-bitcoin/caravan/commit/0a73b094984fd59c7564eda0fa31eb8f05b96927) Thanks [@bucko13](https://github.com/bucko13)! - Adds support for translatePSBT for segwit PSBTs. This enables loading tx data directly from a psbt for ledger and trezor
+
+- Updated dependencies [[`0a73b09`](https://github.com/caravan-bitcoin/caravan/commit/0a73b094984fd59c7564eda0fa31eb8f05b96927)]:
+  - @caravan/psbt@1.6.0
+  - @caravan/wallets@0.4.0
+
+## 1.4.0
+
+### Minor Changes
+
+- [#117](https://github.com/caravan-bitcoin/caravan/pull/117) [`d0e08e8`](https://github.com/caravan-bitcoin/caravan/commit/d0e08e872a63011d2ed72b6b9a68e54db1649b44) Thanks [@benma](https://github.com/benma)! - Add support for the BitBox02 hardware wallet
+
+### Patch Changes
+
+- Updated dependencies [[`d0e08e8`](https://github.com/caravan-bitcoin/caravan/commit/d0e08e872a63011d2ed72b6b9a68e54db1649b44)]:
+  - @caravan/wallets@0.3.0
+
+## 1.3.0
+
+### Minor Changes
+
+- [#138](https://github.com/caravan-bitcoin/caravan/pull/138) [`4ecc56a`](https://github.com/caravan-bitcoin/caravan/commit/4ecc56aefc1ecdde7a2ffa157e0d1e29515a5bc4) Thanks [@bucko13](https://github.com/bucko13)! - Add bip32 package and UI for blinded xpub support in wallet creation
+
 ## 1.2.0
 
 ### Minor Changes

diff --git a/apps/coordinator/package.json b/apps/coordinator/package.json
@@ -1,7 +1,7 @@
 {
   "name": "caravan-coordinator",
   "private": true,
-  "version": "1.2.0",
+  "version": "1.4.1",
   "description": "Unchained Capital's Bitcoin Multisig Coordinator Application",
   "main": "index.jsx",
   "type": "module",

diff --git a/apps/coordinator/src/actions/keystoreActions.ts b/apps/coordinator/src/actions/keystoreActions.ts
@@ -1,10 +1,11 @@
-import { TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
+import { BITBOX, TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
 
 export const SET_KEYSTORE = "SET_KEYSTORE";
 export const SET_KEYSTORE_NOTE = "SET_KEYSTORE_NOTE";
 export const SET_KEYSTORE_STATUS = "SET_KEYSTORE_STATUS";
 
 type KeyStoreType =
+  | typeof BITBOX
   | typeof TREZOR
   | typeof LEDGER
   | typeof HERMIT

diff --git a/apps/coordinator/src/components/CreateAddress/HardwareWalletPublicKeyImporter.jsx b/apps/coordinator/src/components/CreateAddress/HardwareWalletPublicKeyImporter.jsx
@@ -6,6 +6,7 @@ import {
   ACTIVE,
   ERROR,
   ExportPublicKey,
+  BITBOX,
   TREZOR,
   LEDGER,
 } from "@caravan/wallets";
@@ -172,7 +173,7 @@ const HardwareWalletPublicKeyImporter = ({
 
 HardwareWalletPublicKeyImporter.propTypes = {
   network: PropTypes.string.isRequired,
-  method: PropTypes.oneOf([LEDGER, TREZOR]).isRequired,
+  method: PropTypes.oneOf([BITBOX, LEDGER, TREZOR]).isRequired,
   defaultBIP32Path: PropTypes.string.isRequired,
   validatePublicKey: PropTypes.func.isRequired,
   enableChangeMethod: PropTypes.func.isRequired,

diff --git a/apps/coordinator/src/components/CreateAddress/PublicKeyImporter.jsx b/apps/coordinator/src/components/CreateAddress/PublicKeyImporter.jsx
@@ -2,7 +2,7 @@ import React, { useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { connect } from "react-redux";
 import { validatePublicKey as baseValidatePublicKey } from "@caravan/bitcoin";
-import { TREZOR, LEDGER } from "@caravan/wallets";
+import { BITBOX, TREZOR, LEDGER } from "@caravan/wallets";
 
 // Components
 import {
@@ -213,6 +213,7 @@ const PublicKeyImporter = ({
 
   const renderImportByMethod = () => {
     if (
+      publicKeyImporter.method === BITBOX ||
       publicKeyImporter.method === TREZOR ||
       publicKeyImporter.method === LEDGER
     ) {
@@ -261,6 +262,7 @@ const PublicKeyImporter = ({
             variant="standard"
           >
             <MenuItem value="">{"< Select method >"}</MenuItem>
+            <MenuItem value={BITBOX}>BitBox</MenuItem>
             <MenuItem value={TREZOR}>Trezor</MenuItem>
             <MenuItem value={LEDGER}>Ledger</MenuItem>
             <MenuItem value={XPUB}>Derive from extended public key</MenuItem>

diff --git a/apps/coordinator/src/components/RegisterWallet/RegisterBitBoxButton.jsx b/apps/coordinator/src/components/RegisterWallet/RegisterBitBoxButton.jsx
@@ -0,0 +1,39 @@
+import React, { useState } from "react";
+import { Button } from "@mui/material";
+import { useDispatch, useSelector } from "react-redux";
+import { BITBOX, RegisterWalletPolicy } from "@caravan/wallets";
+import { getWalletConfig } from "../../selectors/wallet";
+import { setErrorNotification } from "../../actions/errorNotificationActions";
+
+const RegisterBitBoxButton = ({ ...otherProps }) => {
+  const [isActive, setIsActive] = useState(false);
+  const walletConfig = useSelector(getWalletConfig);
+  const dispatch = useDispatch();
+
+  const registerWallet = async () => {
+    setIsActive(true);
+    try {
+      const interaction = new RegisterWalletPolicy({
+        keystore: BITBOX,
+        ...walletConfig,
+      });
+      await interaction.run();
+    } catch (e) {
+      dispatch(setErrorNotification(e.message));
+    } finally {
+      setIsActive(false);
+    }
+  };
+  return (
+    <Button
+      variant="outlined"
+      onClick={registerWallet}
+      disabled={isActive}
+      {...otherProps}
+    >
+      Register w/ BitBox
+    </Button>
+  );
+};
+
+export default RegisterBitBoxButton;
diff --git a/apps/coordinator/src/components/RegisterWallet/index.jsx b/apps/coordinator/src/components/RegisterWallet/index.jsx
@@ -1,9 +1,11 @@
 import DownloadColdardConfigButton from "./DownloadColdcardConfig";
 import PolicyRegistrationTable from "./PolicyRegistrationsTable";
+import RegisterBitBoxButton from "./RegisterBitBoxButton";
 import RegisterLedgerButton from "./RegisterLedgerButton";
 
 export {
   DownloadColdardConfigButton,
   PolicyRegistrationTable,
+  RegisterBitBoxButton,
   RegisterLedgerButton,
 };
diff --git a/apps/coordinator/src/components/ScriptExplorer/DirectSignatureImporter.jsx b/apps/coordinator/src/components/ScriptExplorer/DirectSignatureImporter.jsx
@@ -56,7 +56,10 @@ class DirectSignatureImporter extends React.Component {
     const policyHmac = walletConfig.ledgerPolicyHmacs.find(
       (hmac) => hmac.xfp === extendedPublicKeyImporter.rootXfp,
     )?.policyHmac;
-
+    const keyDetails = {
+      xfp: extendedPublicKeyImporter.rootXfp,
+      path: signatureImporter.bip32Path,
+    };
     return SignMultisigTransaction({
       network,
       keystore,
@@ -65,6 +68,7 @@ class DirectSignatureImporter extends React.Component {
       bip32Paths,
       walletConfig,
       policyHmac,
+      keyDetails,
       psbt: unsignedPSBT,
       returnSignatureArray: true,
     });

diff --git a/apps/coordinator/src/components/ScriptExplorer/SignatureImporter.jsx b/apps/coordinator/src/components/ScriptExplorer/SignatureImporter.jsx
@@ -7,8 +7,9 @@ import {
   multisigBIP32Root,
   validateBIP32Path,
   getMaskedDerivation,
+  P2SH,
 } from "@caravan/bitcoin";
-import { TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
+import { BITBOX, TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
 import {
   Card,
   CardHeader,
@@ -93,7 +94,7 @@ class SignatureImporter extends React.Component {
   };
 
   renderImport = () => {
-    const { signatureImporter, number, isWallet } = this.props;
+    const { signatureImporter, number, isWallet, addressType } = this.props;
     const currentNumber = this.getCurrent();
     const notMyTurn = number > currentNumber;
     const { disableChangeMethod } = this.state;
@@ -119,6 +120,7 @@ class SignatureImporter extends React.Component {
             onChange={this.handleMethodChange}
           >
             <MenuItem value={UNKNOWN}>{"< Select method >"}</MenuItem>
+            {addressType != P2SH && <MenuItem value={BITBOX}>BitBox</MenuItem>}
             <MenuItem value={TREZOR}>Trezor</MenuItem>
             <MenuItem value={LEDGER}>Ledger</MenuItem>
             <MenuItem value={COLDCARD} disabled={!isWallet}>
@@ -155,7 +157,7 @@ class SignatureImporter extends React.Component {
     } = this.props;
     const { method } = signatureImporter;
 
-    if (method === TREZOR || method === LEDGER) {
+    if (method === BITBOX || method === TREZOR || method === LEDGER) {
       return (
         <DirectSignatureImporter
           network={network}

diff --git a/apps/coordinator/src/components/Slices/ConfirmAddress.jsx b/apps/coordinator/src/components/Slices/ConfirmAddress.jsx
@@ -21,8 +21,10 @@ import {
   multisigAddressType,
   multisigRequiredSigners,
   multisigTotalSigners,
+  P2SH,
 } from "@caravan/bitcoin";
 import {
+  BITBOX,
   TREZOR,
   LEDGER,
   COLDCARD,
@@ -138,6 +140,7 @@ const ConfirmAddress = ({ slice, network }) => {
       }
       // FIXME - hardcoded to just show up for trezor
       if (
+        extendedPublicKeyImporter.method === BITBOX ||
         extendedPublicKeyImporter.method === TREZOR ||
         extendedPublicKeyImporter.method === LEDGER
       ) {
@@ -230,6 +233,9 @@ const ConfirmAddress = ({ slice, network }) => {
               variant="standard"
             >
               <MenuItem value="">{"< Select method >"}</MenuItem>
+              {addressType != P2SH && (
+                <MenuItem value={BITBOX}>BitBox</MenuItem>
+              )}
               <MenuItem value={TREZOR}>Trezor</MenuItem>
               <MenuItem value={LEDGER}>Ledger</MenuItem>
               <MenuItem value={COLDCARD} disabled>

diff --git a/apps/coordinator/src/components/TestSuiteRun/KeystorePicker.tsx b/apps/coordinator/src/components/TestSuiteRun/KeystorePicker.tsx
@@ -2,6 +2,7 @@ import React from "react";
 import { connect } from "react-redux";
 
 import {
+  BITBOX,
   TREZOR,
   LEDGER,
   HERMIT,
@@ -89,6 +90,7 @@ const KeystorePickerBase = ({
               variant="standard"
             >
               <MenuItem value="">{"< Select type >"}</MenuItem>
+              <MenuItem value={BITBOX}>BitBox</MenuItem>
               <MenuItem value={TREZOR}>Trezor</MenuItem>
               <MenuItem value={LEDGER}>Ledger</MenuItem>
               <MenuItem value={COLDCARD}>Coldcard</MenuItem>

diff --git a/apps/coordinator/src/components/TestSuiteRun/TestSuiteRunSummary.tsx b/apps/coordinator/src/components/TestSuiteRun/TestSuiteRunSummary.tsx
@@ -3,6 +3,7 @@ import moment from "moment";
 import { useSelector, useDispatch } from "react-redux";
 import Bowser from "bowser";
 import {
+  BITBOX,
   TREZOR,
   LEDGER,
   HERMIT,
@@ -178,6 +179,8 @@ const TestSuiteRunSummaryBase = () => {
 
   const keystoreName = (type: string) => {
     switch (type) {
+      case BITBOX:
+        return "BitBox";
       case TREZOR:
         return "Trezor";
       case LEDGER:

diff --git a/apps/coordinator/src/components/Wallet/ExtendedPublicKeyImporter.jsx b/apps/coordinator/src/components/Wallet/ExtendedPublicKeyImporter.jsx
@@ -7,8 +7,9 @@ import {
   convertExtendedPublicKey,
   validateExtendedPublicKey,
   Network,
+  P2SH,
 } from "@caravan/bitcoin";
-import { TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
+import { BITBOX, TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
 import {
   Card,
   CardHeader,
@@ -68,7 +69,7 @@ class ExtendedPublicKeyImporter extends React.Component {
   };
 
   renderImport = () => {
-    const { extendedPublicKeyImporter, number } = this.props;
+    const { extendedPublicKeyImporter, number, addressType } = this.props;
     const { disableChangeMethod } = this.state;
     return (
       <div>
@@ -82,6 +83,7 @@ class ExtendedPublicKeyImporter extends React.Component {
             variant="standard"
             onChange={this.handleMethodChange}
           >
+            {addressType != P2SH && <MenuItem value={BITBOX}>BitBox</MenuItem>}
             <MenuItem value={TREZOR}>Trezor</MenuItem>
             <MenuItem value={COLDCARD}>Coldcard</MenuItem>
             <MenuItem value={LEDGER}>Ledger</MenuItem>
@@ -105,7 +107,7 @@ class ExtendedPublicKeyImporter extends React.Component {
     } = this.props;
     const { method } = extendedPublicKeyImporter;
 
-    if (method === TREZOR || method === LEDGER) {
+    if (method === BITBOX || method === TREZOR || method === LEDGER) {
       return (
         <DirectExtendedPublicKeyImporter
           extendedPublicKeyImporter={extendedPublicKeyImporter}

diff --git a/apps/coordinator/src/components/Wallet/RegisterWallet.jsx b/apps/coordinator/src/components/Wallet/RegisterWallet.jsx
@@ -19,6 +19,7 @@ import { getWalletConfig } from "../../selectors/wallet";
 import PolicyRegistrationTable from "../RegisterWallet/PolicyRegistrationsTable";
 import {
   DownloadColdardConfigButton,
+  RegisterBitBoxButton,
   RegisterLedgerButton,
 } from "../RegisterWallet";
 
@@ -89,6 +90,9 @@ const WalletRegistrations = () => {
         <AccordionDetails>
           <Box>
             <Grid container spacing={2}>
+              <Grid item>
+                <RegisterBitBoxButton />
+              </Grid>
               <Grid item>
                 <RegisterLedgerButton />
               </Grid>

diff --git a/apps/coordinator/src/components/Wallet/index.jsx b/apps/coordinator/src/components/Wallet/index.jsx
@@ -150,6 +150,7 @@ class CreateWallet extends React.Component {
       method: (method, index) => {
         if (
           [
+            "bitbox",
             "trezor",
             "coldcard",
             "ledger",

diff --git a/apps/coordinator/src/reducers/transactionReducer.js b/apps/coordinator/src/reducers/transactionReducer.js
@@ -289,6 +289,7 @@ function finalizeOutputs(state, action) {
       network: state.network,
       inputs: state.inputs.map(convertLegacyInput),
       outputs: state.outputs.map(convertLegacyOutput),
+      includeGlobalXpubs: true,
     };
     const psbt = getUnsignedMultisigPsbtV0(args);
     unsignedTransaction = Transaction.fromHex(

diff --git a/apps/coordinator/src/tests/bitbox.js b/apps/coordinator/src/tests/bitbox.js
@@ -0,0 +1,13 @@
+import { BITBOX } from "@caravan/wallets";
+
+import publicKeyTests from "./publicKeys";
+import extendedPublicKeyTests from "./extendedPublicKeys";
+import { signingTests } from "./signing";
+import addressTests from "./addresses";
+import registrationTests from "./registration";
+
+export default publicKeyTests(BITBOX)
+  .concat(extendedPublicKeyTests(BITBOX))
+  .concat(signingTests(BITBOX))
+  .concat(addressTests(BITBOX))
+  .concat(registrationTests(BITBOX));
diff --git a/apps/coordinator/src/tests/index.js b/apps/coordinator/src/tests/index.js
@@ -1,13 +1,15 @@
-import { TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
+import { BITBOX, TREZOR, LEDGER, HERMIT, COLDCARD } from "@caravan/wallets";
 import { TEST_FIXTURES } from "@caravan/bitcoin";
 
+import bitboxTests from "./bitbox";
 import trezorTests from "./trezor";
 import ledgerTests from "./ledger";
 import hermitTests from "./hermit";
 import coldcardTests from "./coldcard";
 
 const SUITE = {};
 
+SUITE[BITBOX] = bitboxTests;
 SUITE[TREZOR] = trezorTests;
 SUITE[LEDGER] = ledgerTests;
 SUITE[HERMIT] = hermitTests;

diff --git a/apps/coordinator/src/tests/registration.jsx b/apps/coordinator/src/tests/registration.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 
 import { TEST_FIXTURES } from "@caravan/bitcoin";
-import { RegisterWalletPolicy } from "@caravan/wallets";
+import { BITBOX, RegisterWalletPolicy } from "@caravan/wallets";
 import { Box, Table, TableBody, TableRow, TableCell } from "@mui/material";
 
 import Test from "./Test";
@@ -13,6 +13,10 @@ class RegisterWalletPolicyTest extends Test {
   }
 
   expected() {
+    if (this.params.keystore === BITBOX) {
+      // BitBox does not use HMACs to register policies.
+      return undefined;
+    }
     return this.params.policyHmac;
   }