fix: missing regtest prefix in address check

package.json

@@ -150,10 +150,10 @@
     "@radix-ui/react-tooltip": "1.0.7",
     "@radix-ui/themes": "2.0.3",
     "@reduxjs/toolkit": "1.9.6",
-    "@scure/base": "1.1.3",
-    "@scure/bip32": "1.3.2",
-    "@scure/bip39": "1.2.1",
-    "@scure/btc-signer": "1.1.0",
+    "@scure/base": "1.1.5",
+    "@scure/bip32": "1.3.3",
+    "@scure/bip39": "1.2.2",
+    "@scure/btc-signer": "1.2.1",
     "@segment/analytics-next": "1.66.0",
     "@sentry/react": "7.106.0",
     "@sentry/tracing": "7.106.0",
@@ -188,7 +188,7 @@
     "base64url": "3.0.1",
     "bignumber.js": "9.1.2",
     "bitcoin-address-validation": "2.2.1",
-    "bitcoinjs-lib": "6.1.3",
+    "bitcoinjs-lib": "6.1.5",
     "bn.js": "5.2.1",
     "c32check": "2.0.0",
     "chroma-js": "2.4.2",

src/app/common/validation/forms/address-validators.ts

@@ -2,7 +2,6 @@ import { AddressType, Network, getAddressInfo, validate } from 'bitcoin-address-
 import * as yup from 'yup';
 
 import { BitcoinNetworkModes, NetworkConfiguration } from '@shared/constants';
-import { bitcoinNetworkModeToCoreNetworkMode } from '@shared/crypto/bitcoin/bitcoin.utils';
 import { isString } from '@shared/utils';
 
 import { FormErrorMessages } from '@app/common/error-messages';
@@ -46,9 +45,16 @@ export function btcTaprootAddressValidator() {
 }
 
 function btcAddressNetworkValidatorFactory(network: BitcoinNetworkModes) {
+  function getAddressNetworkType(network: BitcoinNetworkModes): Network {
+    // Signet uses testnet address format, this parsing is to please the
+    // validation library
+    if (network === 'signet') return Network.testnet;
+    return network as Network;
+  }
+
   return (value?: string) => {
     if (!isString(value)) return false;
-    return validate(value, bitcoinNetworkModeToCoreNetworkMode(network) as Network);
+    return validate(value, getAddressNetworkType(network));
   };
 }
 

src/app/features/psbt-signer/hooks/use-parsed-inputs.tsx

@@ -32,9 +32,9 @@ export function useParsedInputs({ inputs, indexesToSign }: UseParsedInputsArgs)
   const bitcoinNetwork = getBtcSignerLibNetworkConfigByMode(network.chain.bitcoin.bitcoinNetwork);
   const bitcoinAddressNativeSegwit = useCurrentAccountNativeSegwitIndexZeroSigner().address;
   const { address: bitcoinAddressTaproot } = useCurrentAccountTaprootIndexZeroSigner();
-  const inscriptions = useGetInscriptionsByOutputQueries(inputs).map(query => {
-    return query.data?.results[0];
-  });
+  const inscriptions = useGetInscriptionsByOutputQueries(inputs).map(
+    query => query.data?.results[0]
+  );
   const signAll = isUndefined(indexesToSign);
 
   const psbtInputs = useMemo(

src/app/pages/psbt-request/use-psbt-request.tsx

@@ -44,7 +44,7 @@ export function usePsbtRequest() {
         const tx = getPsbtAsTransaction(payload.hex);
 
         try {
-          const signingConfig = getDefaultSigningConfig(hexToBytes(payload.hex));
+          const signingConfig = getDefaultSigningConfig(hexToBytes(payload.hex), signAtIndex);
           const signedTx = await signPsbt({ tx, signingConfig });
 
           const signedPsbt = signedTx.toPSBT();

src/app/store/accounts/blockchain/bitcoin/bitcoin.hooks.ts

@@ -17,7 +17,7 @@ import {
   getAssumedZeroIndexSigningConfig,
 } from '@shared/crypto/bitcoin/signer-config';
 import { allSighashTypes } from '@shared/rpc/methods/sign-psbt';
-import { isNumber } from '@shared/utils';
+import { isNumber, isUndefined } from '@shared/utils';
 
 import { useAnalytics } from '@app/common/hooks/analytics/use-analytics';
 import { useWalletType } from '@app/common/use-wallet-type';
@@ -130,14 +130,18 @@ export function useSignLedgerBitcoinTx() {
 
     const btcSignerPsbtClone = btc.Transaction.fromPSBT(psbt.toBuffer());
 
-    const inputByPaymentType = signingConfig.map(config => [
-      config,
-      getInputPaymentType(
-        config.index,
-        btcSignerPsbtClone.getInput(config.index),
-        network.chain.bitcoin.bitcoinNetwork
-      ),
-    ]) as readonly [BitcoinInputSigningConfig, PaymentTypes][];
+    const inputByPaymentType = signingConfig.map(config => {
+      const inputIndex = btcSignerPsbtClone.getInput(config.index).index;
+      if (isUndefined(inputIndex)) throw new Error('Input must have an index for payment type');
+      return [
+        config,
+        getInputPaymentType(
+          inputIndex,
+          btcSignerPsbtClone.getInput(config.index),
+          network.chain.bitcoin.bitcoinNetwork
+        ),
+      ];
+    }) as readonly [BitcoinInputSigningConfig, PaymentTypes][];
 
     //
     // Taproot

src/shared/crypto/bitcoin/bitcoin.utils.ts

@@ -266,7 +266,9 @@ export function getInputPaymentType(
 ): PaymentTypes {
   const address = getBitcoinInputAddress(index, input, getBtcSignerLibNetworkConfigByMode(network));
   if (address === '') throw new Error('Input address cannot be empty');
-  if (address.startsWith('bc1p') || address.startsWith('tb1p')) return 'p2tr';
-  if (address.startsWith('bc1q') || address.startsWith('tb1q')) return 'p2wpkh';
+  if (address.startsWith('bc1p') || address.startsWith('tb1p') || address.startsWith('bcrt1p'))
+    return 'p2tr';
+  if (address.startsWith('bc1q') || address.startsWith('tb1q') || address.startsWith('bcrt1q'))
+    return 'p2wpkh';
   throw new Error('Unable to infer payment type from input address');
 }

src/shared/crypto/bitcoin/signer-config.ts

@@ -2,7 +2,7 @@ import * as btc from '@scure/btc-signer';
 
 import { BitcoinNetworkModes } from '@shared/constants';
 import { logger } from '@shared/logger';
-import { makeNumberRange } from '@shared/utils';
+import { isUndefined, makeNumberRange } from '@shared/utils';
 
 import { getInputPaymentType } from './bitcoin.utils';
 import { getTaprootAddressIndexDerivationPath } from './p2tr-address-gen';
@@ -32,7 +32,9 @@ export function getAssumedZeroIndexSigningConfig({
       return indexes.map(inputIndex => {
         const input = tx.getInput(inputIndex);
 
-        const paymentType = getInputPaymentType(inputIndex, input, 'mainnet');
+        if (isUndefined(input.index)) throw new Error('Input must have an index for payment type');
+        const paymentType = getInputPaymentType(input.index, input, network);
+
         switch (paymentType) {
           case 'p2wpkh':
             return {